grub-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH 3/9] btrfs: Move the error logging from find_device() to its call


From: 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

From: Goffredo Baroncelli <address@hidden>

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 <address@hidden>
Reviewed-by: Daniel Kiper <address@hidden>
---
 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;
-- 
2.19.1




reply via email to

[Prev in Thread] Current Thread [Next in Thread]