btrfs: sysfs, btrfs_sysfs_add_fsid() drop unused argument parent

Commit 82631319 ("Btrfs: sysfs: add support to add parent for fsid")
added parent argument in preparation to show the seed fsid under the
sprout fsid as in the patch [1] in the mailing list.

 [1] Btrfs: sysfs: support seed devices in the sysfs layout

But later this idea was superseded by another idea to rename the fsid as
in the commit 46e23fb6419b ("btrfs: factor out sysfs code for updating
sprout fsid").

So we don't need parent argument anymore.

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/disk-io.c b/fs/btrfs/disk-io.c
index e0edfdc9c82bea289b88d320e98147b7a88ef4bf..6391043266910e3fabee9c439fc9fa851eab1002 100644 (file)
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -3082,7 +3082,7 @@ int __cold open_ctree(struct super_block *sb,
 
        btrfs_free_extra_devids(fs_devices, 1);
 
-       ret = btrfs_sysfs_add_fsid(fs_devices, NULL);
+       ret = btrfs_sysfs_add_fsid(fs_devices);
        if (ret) {
                btrfs_err(fs_info, "failed to init sysfs fsid interface: %d",
                                ret);

diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
index 3799af42ee293ff150de5882fb74d79e6e432354..1d8ee57da164a7b50590b9e341b433288e4a9c76 100644 (file)
--- a/fs/btrfs/sysfs.c
+++ b/fs/btrfs/sysfs.c
@@ -1065,18 +1065,19 @@ void btrfs_sysfs_update_sprout_fsid(struct btrfs_fs_devices *fs_devices,
 static struct kset *btrfs_kset;
 
 /*
+ * Creates:
+ *             /sys/fs/btrfs/UUID
+ *
  * Can be called by the device discovery thread.
- * And parent can be specified for seed device
  */
-int btrfs_sysfs_add_fsid(struct btrfs_fs_devices *fs_devs,
-                               struct kobject *parent)
+int btrfs_sysfs_add_fsid(struct btrfs_fs_devices *fs_devs)
 {
        int error;
 
        init_completion(&fs_devs->kobj_unregister);
        fs_devs->fsid_kobj.kset = btrfs_kset;
-       error = kobject_init_and_add(&fs_devs->fsid_kobj,
-                               &btrfs_ktype, parent, "%pU", fs_devs->fsid);
+       error = kobject_init_and_add(&fs_devs->fsid_kobj, &btrfs_ktype, NULL,
+                                    "%pU", fs_devs->fsid);
        if (error) {
                kobject_put(&fs_devs->fsid_kobj);
                return error;

diff --git a/fs/btrfs/sysfs.h b/fs/btrfs/sysfs.h
index e10c3adfc30fc62b367d24ba2148aee75ef2c57f..a0454947f41a28c2191d658a9c029f3a643e1aed 100644 (file)
--- a/fs/btrfs/sysfs.h
+++ b/fs/btrfs/sysfs.h
@@ -18,9 +18,8 @@ int btrfs_sysfs_add_device_link(struct btrfs_fs_devices *fs_devices,
                struct btrfs_device *one_device);
 int btrfs_sysfs_rm_device_link(struct btrfs_fs_devices *fs_devices,
                 struct btrfs_device *one_device);
-int btrfs_sysfs_add_fsid(struct btrfs_fs_devices *fs_devs,
-                               struct kobject *parent);
-int btrfs_sysfs_add_device(struct btrfs_fs_devices *fs_devs);
+int btrfs_sysfs_add_fsid(struct btrfs_fs_devices *fs_devs);
+int btrfs_sysfs_add_devices_kobj(struct btrfs_fs_devices *fs_devs);
 void btrfs_sysfs_remove_fsid(struct btrfs_fs_devices *fs_devs);
 void btrfs_sysfs_update_sprout_fsid(struct btrfs_fs_devices *fs_devices,
                                    const u8 *fsid);