From patchwork Thu Oct 11 18:50:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Goffredo Baroncelli X-Patchwork-Id: 10637175 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 49229933 for ; Thu, 11 Oct 2018 18:51:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3B44C2BF6E for ; Thu, 11 Oct 2018 18:51:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 36FE42BFCB; Thu, 11 Oct 2018 18:51:20 +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 B33FC2BFCF for ; Thu, 11 Oct 2018 18:51:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729835AbeJLCTq (ORCPT ); Thu, 11 Oct 2018 22:19:46 -0400 Received: from smtp-33-i6.italiaonline.it ([213.209.14.33]:33723 "EHLO libero.it" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729785AbeJLCTo (ORCPT ); Thu, 11 Oct 2018 22:19:44 -0400 Received: from venice.bhome ([94.38.186.31]) by smtp-33.iol.local with ESMTPA id Ag3FgMwlrQGOzAg3GgbXzm; Thu, 11 Oct 2018 20:51:15 +0200 x-libjamoibt: 1601 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=libero.it; s=s2014; t=1539283875; bh=mU0CLGmoxJNDijdmxkWh5T+f++hham1acS2GkejH0IQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=hit0rE7fHBlBOeCQEeDDjUIcjP3WN4YyXsYKyUrSnf1SvSgbNB2qlXTcmhyG+zMAA 2A9Si3FzAGCyOrPyMBjP7KohGrwIpXDZCdIGicaF+v4Vd/ZzMWCxp4sG8/+Gb0Nf08 jEgA+c5ASZsBtsrrDBhv4qM0QTfVaVKKCpnKAKLq05b7aQBwGREbh8P5Q0jopw0qDl kOx1j5YZ+Nu/x4H8iTY2wCQ0lX/hJ/1D6XNUNrn+59paMlUDxnb5Co50vaaNRnBFbc s9bJqUF8aTODWYrfMVziw2Hi+JAJTY5QlRvIjib+5717GyFKvQ/bMyBZIU/+I01e3v R0AIfP/bCzTEw== X-CNFS-Analysis: v=2.3 cv=OvCeNB3t c=1 sm=1 tr=0 a=I+JNyrl7/zjgsFWlY3jFdA==:117 a=I+JNyrl7/zjgsFWlY3jFdA==:17 a=yPCof4ZbAAAA:8 a=fGidO4j3AiKtNeS3nH0A:9 From: Goffredo Baroncelli To: grub-devel@gnu.org Cc: Daniel Kiper , linux-btrfs@vger.kernel.org, Goffredo Baroncelli Subject: [PATCH 3/9] btrfs: Move the error logging from find_device() to its caller. Date: Thu, 11 Oct 2018 20:50:57 +0200 Message-Id: <20181011185103.23146-4-kreijack@libero.it> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181011185103.23146-1-kreijack@libero.it> References: <20181011185103.23146-1-kreijack@libero.it> MIME-Version: 1.0 X-CMAE-Envelope: MS4wfAOQ0iifhU0WYY0oY57gOQ1sRzzoHQ1p3kZH9AXynZPcZOAdcW/h8cGf3khroZoLd6ZLhS0ryzGJ90YmzoMDB8r8uRECD8mrjdMlcK/RwmZKWd2fdqla CnPlCYBOyq1CMnAImYTdlktNawuIoo+rgTAt9BM6W0SIpB0H9s58S0/N4qukv8GxiZJ3lqFdj5MI6C67eh+qnLawPSluQpwLiSZPz2wskncgBeFk9uyAvdzt KekuTSL7J2P3aZe7wD2Edh7Z8QtgtCPGraXHBKb1lfc= 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 The caller knows better if this error is fatal or not, i.e. another disk is available or not. This is a preparatory patch. Signed-off-by: Goffredo Baroncelli Reviewed-by: Daniel Kiper --- grub-core/fs/btrfs.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c index c9f0c4193..2a87eb103 100644 --- a/grub-core/fs/btrfs.c +++ b/grub-core/fs/btrfs.c @@ -603,12 +603,7 @@ find_device (struct grub_btrfs_data *data, grub_uint64_t id, int do_rescan) if (do_rescan) grub_device_iterate (find_device_iter, &ctx); if (!ctx.dev_found) - { - grub_error (GRUB_ERR_BAD_FS, - N_("couldn't find a necessary member device " - "of multi-device filesystem")); - return NULL; - } + return NULL; data->n_devices_attached++; if (data->n_devices_attached > data->n_devices_allocated) { @@ -905,6 +900,9 @@ grub_btrfs_read_logical (struct grub_btrfs_data *data, grub_disk_addr_t addr, dev = find_device (data, stripe->device_id, j); if (!dev) { + grub_dprintf ("btrfs", + "couldn't find a necessary member device " + "of multi-device filesystem\n"); err = grub_errno; grub_errno = GRUB_ERR_NONE; continue;