btrfs: refactor btrfs_sysfs_add_devices_dir
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH v3 4/15 btrfs: refactor btrfs_sysfs_add_devices_dir
When we add device we need to add a device to the sysfs, so instead of using the btrfs_sysfs_add_devices_dir() 2nd argument to specify whether to add a device or all of fs_devices, call the helper function directly btrfs_sysfs_add_device() and thus make it non static.
Signed-off-by Anand Jain <[email protected]>
---
v3:
Fix conflict due to the patch [1]
[1]
btrfs: sysfs: init devices outside of the chunk_mutex
fs/btrfs/dev-replace.c | 2 +- fs/btrfs/sysfs.c | 15 ++++++--------- fs/btrfs/sysfs.h | 3 +-- fs/btrfs/volumes.c | 2 +- 4 files changed, 9 insertions(+), 13 deletions(-)
fs/btrfs/dev-replace.c +1 -1
@@ -512,7 +512,7 @@ static int btrfs_dev_replace_start(struct btrfs_fs_info *fs_info,atomic64_set (&dev_replace->num_uncorrectable_read_errors,0 );up_write (&dev_replace->rwsem); - ret =btrfs_sysfs_add_devices_dir (tgt_device->fs_devices, tgt_device); + ret =btrfs_sysfs_add_device (tgt_device);if (ret)btrfs_err (fs_info,"kobj add dev failed %d" , ret);
fs/btrfs/sysfs.c +6 -9
@@ -1265,7 +1265,7 @@ static struct kobj_type devid_ktype = { .release = btrfs_release_devid_kobj, }; -static int btrfs_sysfs_add_device (struct btrfs_device *device) +int btrfs_sysfs_add_device (struct btrfs_device *device) {int ret;unsigned int nofs_flag;
@@ -1315,16 +1315,13 @@ static int btrfs_sysfs_add_device(struct btrfs_device *device)return ret; } -int btrfs_sysfs_add_devices_dir (struct btrfs_fs_devices *fs_devices, -struct btrfs_device *one_device) +int btrfs_sysfs_add_fs_devices (struct btrfs_fs_devices *fs_devices) {int ret; +struct btrfs_device *device; -if (one_device) -return btrfs_sysfs_add_device (one_device); - -list_for_each_entry (one_device, &fs_devices->devices, dev_list) { - ret =btrfs_sysfs_add_device (one_device); +list_for_each_entry (device, &fs_devices->devices, dev_list) { + ret =btrfs_sysfs_add_device (device);if (ret)return ret; }
@@ -1419,7 +1416,7 @@ int btrfs_sysfs_add_mounted(struct btrfs_fs_info *fs_info)struct btrfs_fs_devices *fs_devs = fs_info->fs_devices;struct kobject *fsid_kobj = &fs_devs->fsid_kobj; - error =btrfs_sysfs_add_devices_dir (fs_devs,NULL ); + error =btrfs_sysfs_add_fs_devices (fs_devs);if (error)return error;
fs/btrfs/sysfs.h +1 -2
@@ -14,8 +14,7 @@ enum btrfs_feature_set {char *btrfs_printable_features (enum btrfs_feature_set set,u64 flags);const char *btrfs_feature_set_name (enum btrfs_feature_set set); -int btrfs_sysfs_add_devices_dir (struct btrfs_fs_devices *fs_devices, -struct btrfs_device *one_device); +int btrfs_sysfs_add_device (struct btrfs_device *device);void btrfs_sysfs_remove_devices_dir (struct btrfs_fs_devices *fs_devices,struct btrfs_device *one_device);int btrfs_sysfs_add_fsid (struct btrfs_fs_devices *fs_devs);
fs/btrfs/volumes.c +1 -1
@@ -2606,7 +2606,7 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, const char *device_pathmutex_unlock (&fs_info->chunk_mutex);/* Add sysfs device entry */ -btrfs_sysfs_add_devices_dir (fs_devices, device); +btrfs_sysfs_add_device (device);mutex_unlock (&fs_devices->device_list_mutex);
Signature · 1 line
2.25.1