diff options
| author | Anand Jain <anand.jain@oracle.com> | 2020-09-05 01:34:26 +0800 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2020-10-07 12:12:21 +0200 |
| commit | cd36da2e7ec67f0da9c1efc8a87ad31bd9242ec3 (patch) | |
| tree | 255c31cf1e61c25b02015417eb09f70cdc40fb67 /fs/btrfs/sysfs.c | |
| parent | 6a416a018f1a9372a43465c366e91d202da01e11 (diff) | |
| download | linux-cd36da2e7ec67f0da9c1efc8a87ad31bd9242ec3.tar.gz | |
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>
Diffstat (limited to 'fs/btrfs/sysfs.c')
| -rw-r--r-- | fs/btrfs/sysfs.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c index 66fbb82b0bd5..bc341560dc69 100644 --- 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; |