From patchwork Wed Sep 19 18:40:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Goffredo Baroncelli X-Patchwork-Id: 10606179 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 4567814DA for ; Wed, 19 Sep 2018 18:41:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 369B92C84D for ; Wed, 19 Sep 2018 18:41:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 29E0C2C854; Wed, 19 Sep 2018 18:41:15 +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 C36452C853 for ; Wed, 19 Sep 2018 18:41:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732372AbeITAUY (ORCPT ); Wed, 19 Sep 2018 20:20:24 -0400 Received: from smtp-33-i6.italiaonline.it ([213.209.14.33]:39442 "EHLO libero.it" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1731938AbeITAUY (ORCPT ); Wed, 19 Sep 2018 20:20:24 -0400 Received: from venice.bhome ([94.38.18.13]) by smtp-33.iol.local with ESMTPA id 2hPRgg79sQGOz2hPTgVZpK; Wed, 19 Sep 2018 20:41:11 +0200 x-libjamoibt: 1601 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=libero.it; s=s2014; t=1537382471; bh=rgSec24NkXvUkvf48s337E2vvOpCLcpTqsUUt0ir69Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=mT4ppFVg5KFFXA2yFIKX7Xy024T0ThAd4thO7oLj9Qc7+eL+ytT5Ddys5R5klPLjB CL9jWrCbBA7yWPazJq167XixJHM6ikrpS6NUKNWJ2E0aXTXmrNDENYivIUrqhviqFG I6zSwW55ZAJ1nMr+F9UQtG8S+VZWPHTy2qcs8OiwJWxP7NLm9DAcEGHRbRMz/o5jw1 m9aXHXU5/va6+fcBcREccduYcrZEU9lnNvSxy2Ntthgmsc08NyKjXRMgSAZp6vO0d7 pN8LZPsbOD/dJMd99Pm3QiGuKwreXrJaSx2SGVCVoTz2mHmBuc9DHmTili91siTJUW tWbyL517rrq+g== 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=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: Wed, 19 Sep 2018 20:40:34 +0200 Message-Id: <20180919184040.22540-4-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: MS4wfDPsmObly8e/k5E4XFRJXOI/IWpTHcTuN4PjnH30VL0BdRINHzP/xGM0hUKtYfZBlhbjzxPjkE67N/jK8qyb+JSBdqaurnf+n2/6GHiBl/7CFdEyt5fV ri0xX8kfGbURdtJIJyl1wgg5b79eB2nJe081yJPeLyXHTXWthywHYWaCUz46ow6LGTdBqooL/yu+DVMB9xBtM/nGEHEsLnXoHc7LAk+OI7pdebenL8xMWdnr zqYdyYzFVOAuub0qdj6027V0y4PMEWaWUINjH8XXK60= 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c index 4f404f4b2..0cdfaf7c0 100644 --- a/grub-core/fs/btrfs.c +++ b/grub-core/fs/btrfs.c @@ -604,9 +604,6 @@ find_device (struct grub_btrfs_data *data, grub_uint64_t id, int 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; } data->n_devices_attached++; @@ -898,6 +895,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;