Commit c6761a9e authored by Anand Jain's avatar Anand Jain Committed by David Sterba
Browse files

btrfs: sysfs, btrfs_sysfs_add_fsid() drop unused argument parent 



Commit 24bd69cb ("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 f93c3997 ("btrfs: factor out sysfs code for updating
sprout fsid").

So we don't need parent argument anymore.

Signed-off-by: default avatarAnand Jain <anand.jain@oracle.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent b5501504

fs/btrfs/disk-io.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

fs/btrfs/sysfs.c

+6 −5
Original line number Diff line number Diff line
@@ -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;

fs/btrfs/sysfs.h

+2 −3
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE