[PATCH 3/9] btrfs: move the error logging from find_device() to its callee.

[Goffredo Baroncelli]

This is a preparatory patch. The callee knows better if this
error is fatal or not, i.e. another available disk.


Signed-off-by: Goffredo Baroncelli <address@hidden>
---
 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 123bfbfc1..fd4225d11 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++;
@@ -900,6 +897,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.17.0