leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

btrfs: rename local devices for fs_devices in btrfs_free_stale_devices(

Browse Source 
Over the years we named %fs_devices and %devices to represent the
struct btrfs_fs_devices and the struct btrfs_device. So follow the same
scheme here too. No functional changes.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Anand Jain
2018-05-29 15:33:08 +08:00
committed by David Sterba
parent 9c6d173ea6
commit fa6d2ae540
1 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
fs/btrfs/volumes.c
View File

@@ -631,43 +631,42 @@ static void pending_bios_fn(struct btrfs_work *work)
* devices. * devices.
*/ */
static void btrfs_free_stale_devices(const char *path, static void btrfs_free_stale_devices(const char *path,
struct btrfs_device *skip_dev) struct btrfs_device *skip_device)
{ {
struct btrfs_fs_devices *fs_devs, *tmp_fs_devs; struct btrfs_fs_devices *fs_devices, *tmp_fs_devices;
struct btrfs_device *dev, *tmp_dev; struct btrfs_device *device, *tmp_device;
list_for_each_entry_safe(fs_devs, tmp_fs_devs, &fs_uuids, fs_list) { list_for_each_entry_safe(fs_devices, tmp_fs_devices, &fs_uuids, fs_list) {
if (fs_devices->opened)
if (fs_devs->opened)
continue; continue;
list_for_each_entry_safe(dev, tmp_dev, list_for_each_entry_safe(device, tmp_device,
&fs_devs->devices, dev_list) { &fs_devices->devices, dev_list) {
int not_found = 0; int not_found = 0;
if (skip_dev && skip_dev == dev) if (skip_device && skip_device == device)
continue; continue;
if (path && !dev->name) if (path && !device->name)
continue; continue;
rcu_read_lock(); rcu_read_lock();
if (path) if (path)
not_found = strcmp(rcu_str_deref(dev->name), not_found = strcmp(rcu_str_deref(device->name),
path); path);
rcu_read_unlock(); rcu_read_unlock();
if (not_found) if (not_found)
continue; continue;
/* delete the stale device */ /* delete the stale device */
if (fs_devs->num_devices == 1) { if (fs_devices->num_devices == 1) {
btrfs_sysfs_remove_fsid(fs_devs); btrfs_sysfs_remove_fsid(fs_devices);
list_del(&fs_devs->fs_list); list_del(&fs_devices->fs_list);
free_fs_devices(fs_devs); free_fs_devices(fs_devices);
break; break;
} else { } else {
fs_devs->num_devices--; fs_devices->num_devices--;
list_del(&dev->dev_list); list_del(&device->dev_list);
btrfs_free_device(dev); btrfs_free_device(device);
} }
} }
} }