summaryrefslogtreecommitdiff
path: root/utils.c
diff options
context:
space:
mode:
authorYauhen Kharuzhy <yauhen.kharuzhy@zavadatar.com>2016-03-10 16:04:35 -0800
committerDavid Sterba <dsterba@suse.com>2016-03-14 13:42:47 +0100
commit3ee935e4dd23a97de31a07e36b32871730801e05 (patch)
treefd53c94b23563a1472fa15cef1f1b1eba2cc8568 /utils.c
parent83ad1dcbb09d68e11a7338b066571080e9264755 (diff)
btrfs-progs: Dont' stop scanning of devices at first failed device
When 'btrfs device scan' command is invoked, it scans all devices, check them for btrfs superblock and add devices with btrfs to a list. Next, each device from the list is passed to kernel where it is handled in the btrfs_scan_one_device() function. This function can, for example, return -EBUSY when device contains superblock matched to existing and mounted filesystem (if this device was pulled out from RAID and connected again after some time). btrfs tool stops device scan if any device has been failed to add, so other existing devices with (possibly) valid FS will never be reached. Fix this by remove stopping at any failure in the btrfs_register_all_devices(), just return error count. btrfs_scan_one_device() reports any kind of error already. Signed-off-by: Yauhen Kharuzhy <yauhen.kharuzhy@zavadatar.com> [ initialize err to 0 ] Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'utils.c')
-rw-r--r--utils.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/utils.c b/utils.c
index 7d5537fc..d7ceaa8c 100644
--- a/utils.c
+++ b/utils.c
@@ -1545,7 +1545,8 @@ int btrfs_register_one_device(const char *fname)
*/
int btrfs_register_all_devices(void)
{
- int err;
+ int err = 0;
+ int ret = 0;
struct btrfs_fs_devices *fs_devices;
struct btrfs_device *device;
struct list_head *all_uuids;
@@ -1554,16 +1555,15 @@ int btrfs_register_all_devices(void)
list_for_each_entry(fs_devices, all_uuids, list) {
list_for_each_entry(device, &fs_devices->devices, dev_list) {
- if (*device->name) {
+ if (*device->name)
err = btrfs_register_one_device(device->name);
- if (err < 0)
- return err;
- if (err > 0)
- return -err;
- }
+
+ if (err)
+ ret++;
}
}
- return 0;
+
+ return ret;
}
int btrfs_device_already_in_root(struct btrfs_root *root, int fd,