From patchwork Wed Sep 19 18:40:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Goffredo Baroncelli X-Patchwork-Id: 10606185 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 740D017E1 for ; Wed, 19 Sep 2018 18:41:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 664A32C841 for ; Wed, 19 Sep 2018 18:41:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5ADD72C84E; Wed, 19 Sep 2018 18:41:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F168E2C841 for ; Wed, 19 Sep 2018 18:41:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732457AbeITAU0 (ORCPT ); Wed, 19 Sep 2018 20:20:26 -0400 Received: from smtp-33-i6.italiaonline.it ([213.209.14.33]:53628 "EHLO libero.it" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1732232AbeITAUZ (ORCPT ); Wed, 19 Sep 2018 20:20:25 -0400 Received: from venice.bhome ([94.38.18.13]) by smtp-33.iol.local with ESMTPA id 2hPRgg79sQGOz2hPTgVZpT; Wed, 19 Sep 2018 20:41:12 +0200 x-libjamoibt: 1601 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=libero.it; s=s2014; t=1537382472; bh=a1XyaAyvB2vvcQq0SOAv9moH0WVU9nxDSGNoFRgXreQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=rvlJzypMS3HhwuSE9lgmwyaffrbqt3c0Pord02pDhGoyNVwe3x5DA+q7xvsDOTA3c eEN3o/sFm7QEc8b/BXjsflyR8vtC9/OIRlVWTY7E2b4Maqrkjjch31Wv6bxpD4lQl4 dXmAJdIWPVi29T3HY6hWHp88aiQyixlsJX5kVeB4Yr5Ih2KwyWJ0HkrCvfhwExk+vE c85t/fvGVv6h5K42sGoHtYMPnXQIJRLRxSdtKCBFE/4EAF2mxrVXQ8BO1d5qbEetha 9pP9+IJtUno9IImvWHin5KAR9MOs0UTC+17T8YXQBo6pGj6OTlvwnWX8dziK1+sMMT 0mEnPnNQW23fA== X-CNFS-Analysis: v=2.3 cv=OvCeNB3t c=1 sm=1 tr=0 a=y+pHRDKYf/eurU+tzaSv/w==:117 a=y+pHRDKYf/eurU+tzaSv/w==:17 a=tK7bS5S69CJdjAdesZkA:9 From: Goffredo Baroncelli To: grub-devel@gnu.org Cc: Daniel Kiper , linux-btrfs@vger.kernel.org, Goffredo Baroncelli Subject: [PATCH 4/9] btrfs: Avoid a rescan for a device which was already not found. Date: Wed, 19 Sep 2018 20:40:35 +0200 Message-Id: <20180919184040.22540-5-kreijack@libero.it> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20180919184040.22540-1-kreijack@libero.it> References: <20180919184040.22540-1-kreijack@libero.it> MIME-Version: 1.0 X-CMAE-Envelope: MS4wfFZcIo3ET48ebVvPHE+jIj4TnauOPMDwNPmhC0hgzHV0L8oQfX2vSujgxUKOhSgDKu977wcy8pWjjEJqI+HHVQNnJP5/JfV9rM9Spz1ha7dUX3420m9N QARbjG/JM6Om9TWPegXvwKQx6xGcWxVvnzUAM4baPumgbnSJZpFaCNIYl6GEYiIOkQPnF+ZZHvlckHqITNw6J1XFRRFkYT/c2swK0hpXxM7RXUh1MkVN6oPG qh+NUC3Hw31yFxhxa5be9wyeW4kpskpHU4oAjo+7X2Q= Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Goffredo Baroncelli If a device is not found, do not return immediately but record this failure by storing NULL in data->devices_attached[]. This way we avoid unnecessary devices rescan, and speedup the reads in case of a degraded array. Signed-off-by: Goffredo Baroncelli --- grub-core/fs/btrfs.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c index 0cdfaf7c0..6e42c33f6 100644 --- a/grub-core/fs/btrfs.c +++ b/grub-core/fs/btrfs.c @@ -588,7 +588,7 @@ find_device_iter (const char *name, void *data) } static grub_device_t -find_device (struct grub_btrfs_data *data, grub_uint64_t id, int do_rescan) +find_device (struct grub_btrfs_data *data, grub_uint64_t id) { struct find_device_ctx ctx = { .data = data, @@ -600,12 +600,9 @@ find_device (struct grub_btrfs_data *data, grub_uint64_t id, int do_rescan) for (i = 0; i < data->n_devices_attached; i++) if (id == data->devices_attached[i].id) return data->devices_attached[i].dev; - if (do_rescan) - grub_device_iterate (find_device_iter, &ctx); - if (!ctx.dev_found) - { - return NULL; - } + + grub_device_iterate (find_device_iter, &ctx); + data->n_devices_attached++; if (data->n_devices_attached > data->n_devices_allocated) { @@ -617,7 +614,8 @@ find_device (struct grub_btrfs_data *data, grub_uint64_t id, int do_rescan) * sizeof (data->devices_attached[0])); if (!data->devices_attached) { - grub_device_close (ctx.dev_found); + if (ctx.dev_found) + grub_device_close (ctx.dev_found); data->devices_attached = tmp; return NULL; } @@ -892,7 +890,7 @@ grub_btrfs_read_logical (struct grub_btrfs_data *data, grub_disk_addr_t addr, " for laddr 0x%" PRIxGRUB_UINT64_T "\n", paddr, addr); - dev = find_device (data, stripe->device_id, j); + dev = find_device (data, stripe->device_id); if (!dev) { grub_dprintf ("btrfs", @@ -969,7 +967,8 @@ grub_btrfs_unmount (struct grub_btrfs_data *data) unsigned i; /* The device 0 is closed one layer upper. */ for (i = 1; i < data->n_devices_attached; i++) - grub_device_close (data->devices_attached[i].dev); + if (data->devices_attached[i].dev) + grub_device_close (data->devices_attached[i].dev); grub_free (data->devices_attached); grub_free (data->extent); grub_free (data);