p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

btrfs: make btrfs_free_stale_device() to iterate all stales 

Let the list iterator iterate further and find other stale
devices and delete it. This is in preparation to add support
for user land request-able stale devices cleanup. Also rename
btrfs_free_stale_device() to btrfs_free_stale_devices().

Signed-off-by: Anand Jain <anand.jain@oracle.com>
Reviewed-by: Josef Bacik <jbacik@fb.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Anand Jain 2018-01-18 22:00:34 +08:00 committed by David Sterba
parent a848b3e547
commit 38cf665d33
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
fs/btrfs/volumes.c
View File

@ -605,21 +605,22 @@ static void pending_bios_fn(struct btrfs_work *work)
} }
static void btrfs_free_stale_device(struct btrfs_device *cur_dev) static void btrfs_free_stale_devices(struct btrfs_device *cur_dev)
{ {
struct btrfs_fs_devices *fs_devs; struct btrfs_fs_devices *fs_devs, *tmp_fs_devs;
struct btrfs_device *dev; struct btrfs_device *dev, *tmp_dev;
if (!cur_dev->name) if (!cur_dev->name)
return; return;
list_for_each_entry(fs_devs, &fs_uuids, list) { list_for_each_entry_safe(fs_devs, tmp_fs_devs, &fs_uuids, list) {
int del = 1;
if (fs_devs->opened) if (fs_devs->opened)
continue; continue;
list_for_each_entry(dev, &fs_devs->devices, dev_list) { list_for_each_entry_safe(dev, tmp_dev,
&fs_devs->devices, dev_list) {
int not_found;
if (dev == cur_dev) if (dev == cur_dev)
continue; continue;
@ -633,14 +634,12 @@ static void btrfs_free_stale_device(struct btrfs_device *cur_dev)
* either use mapper or non mapper path throughout. * either use mapper or non mapper path throughout.
*/ */
rcu_read_lock(); rcu_read_lock();
del = strcmp(rcu_str_deref(dev->name), not_found = strcmp(rcu_str_deref(dev->name),
rcu_str_deref(cur_dev->name)); rcu_str_deref(cur_dev->name));
rcu_read_unlock(); rcu_read_unlock();
if (!del) if (not_found)
break; continue;
}
if (!del) {
/* delete the stale device */ /* delete the stale device */
if (fs_devs->num_devices == 1) { if (fs_devs->num_devices == 1) {
btrfs_sysfs_remove_fsid(fs_devs); btrfs_sysfs_remove_fsid(fs_devs);
@ -651,7 +650,6 @@ static void btrfs_free_stale_device(struct btrfs_device *cur_dev)
list_del(&dev->dev_list); list_del(&dev->dev_list);
free_device(dev); free_device(dev);
} }
break;
} }
} }
} }
@ -779,7 +777,7 @@ static noinline int device_list_add(const char *path,
ret = 1; ret = 1;
device->fs_devices = fs_devices; device->fs_devices = fs_devices;
btrfs_free_stale_device(device); btrfs_free_stale_devices(device);
} else if (!device->name || strcmp(device->name->str, path)) { } else if (!device->name || strcmp(device->name->str, path)) {
/* /*
* When FS is already mounted. * When FS is already mounted.