btrfs: simplify parameters of btrfs_sysfs_add_devices_dir

When we add a device we need to add it to sysfs, so instead of using the
btrfs_sysfs_add_devices_dir() fs_devices 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.

Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Anand Jain <anand.jain@oracle.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c
index bbb3d5ec9ca8561542f22406d39a01a650243f07..c176375c2c026121215f8ea7c21b32d19cf3d791 100644 (file)
--- a/fs/btrfs/dev-replace.c
+++ b/fs/btrfs/dev-replace.c
@@ -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);
 

diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
index 66fbb82b0bd5126cd0205eb549066601d8555435..bc341560dc69c92a2d969bdaac008b8ddd13a7fb 100644 (file)
--- a/fs/btrfs/sysfs.c
+++ b/fs/btrfs/sysfs.c
@@ -1303,7 +1303,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;
@@ -1352,13 +1352,10 @@ out:
        return ret;
 }
 
-int btrfs_sysfs_add_devices_dir(struct btrfs_fs_devices *fs_devices,
-                               struct btrfs_device *device)
+static int btrfs_sysfs_add_fs_devices(struct btrfs_fs_devices *fs_devices)
 {
        int ret;
-
-       if (device)
-               return btrfs_sysfs_add_device(device);
+       struct btrfs_device *device;
 
        list_for_each_entry(device, &fs_devices->devices, dev_list) {
                ret = btrfs_sysfs_add_device(device);
@@ -1456,7 +1453,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;
 

diff --git a/fs/btrfs/sysfs.h b/fs/btrfs/sysfs.h
index 1431dbc3c2ef92df137efd575e014a757230f1a0..6296c4f6b3303501308231ae93eb125c20a9e9f3 100644 (file)
--- a/fs/btrfs/sysfs.h
+++ b/fs/btrfs/sysfs.h
@@ -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 *device);
 int btrfs_sysfs_add_fsid(struct btrfs_fs_devices *fs_devs);

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 13b394d401f9bd9070f6bd88b43fddeb81960374..2aa7fd89efbf71605105a508f5a0de504406e907 100644 (file)
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -2608,7 +2608,7 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, const char *device_path
        mutex_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);