vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

btrfs: Move the error logging from find_device() to its caller

Browse source 
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>
This commit is contained in:
Goffredo Baroncelli 2018-10-22 19:29:33 +02:00 committed by Daniel Kiper
parent 846f7a8310
commit 908cdb1d02
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
grub-core/fs/btrfs.c
View file

@ -603,12 +603,7 @@ find_device (struct grub_btrfs_data *data, grub_uint64_t id, int do_rescan)
if (do_rescan) if (do_rescan)
grub_device_iterate (find_device_iter, &ctx); grub_device_iterate (find_device_iter, &ctx);
if (!ctx.dev_found) if (!ctx.dev_found)
{ return NULL;
grub_error (GRUB_ERR_BAD_FS,
N_("couldn't find a necessary member device "
"of multi-device filesystem"));
return NULL;
}
data->n_devices_attached++; data->n_devices_attached++;
if (data->n_devices_attached > data->n_devices_allocated) 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); dev = find_device (data, stripe->device_id, j);
if (!dev) if (!dev)
{ {
grub_dprintf ("btrfs",
"couldn't find a necessary member device "
"of multi-device filesystem\n");
err = grub_errno; err = grub_errno;
grub_errno = GRUB_ERR_NONE; grub_errno = GRUB_ERR_NONE;
continue; continue;