| Message ID | 20180919184040.22540-4-kreijack@libero.it (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/9] btrfs: Add support for reading a filesystem with a RAID 5 or RAID 6 profile. | expand |
On Wed, Sep 19, 2018 at 08:40:34PM +0200, Goffredo Baroncelli wrote: > From: Goffredo Baroncelli <kreijack@inwind.it> > > 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 <kreijack@inwind.it> > Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> > --- > 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; > } I think that you can drop curly brackets too. If you do that you can retain my Reviewed-by. Daniel
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;