Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Btrfs: sysfs btrfs_kobj_add_device() pass fs_devices instead of fs_info 



btrfs_kobj_add_device() does not need fs_info any more.

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

fs/btrfs/dev-replace.c

+1 −1
Original line number Diff line number Diff line
@@ -584,7 +584,7 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info, 


	/* replace the sysfs entry */

	btrfs_kobj_rm_device(fs_info, src_device);

	btrfs_kobj_add_device(fs_info, tgt_device);

	btrfs_kobj_add_device(fs_info->fs_devices, tgt_device);

	btrfs_rm_dev_replace_free_srcdev(fs_info, src_device);



	/* write back the superblocks */

fs/btrfs/sysfs.c

+3 −4
Original line number Diff line number Diff line
@@ -682,11 +682,10 @@ int btrfs_sysfs_add_device(struct btrfs_fs_devices *fs_devs) 
	return 0;

}



int btrfs_kobj_add_device(struct btrfs_fs_info *fs_info,

int btrfs_kobj_add_device(struct btrfs_fs_devices *fs_devices,

				struct btrfs_device *one_device)

{

	int error = 0;

	struct btrfs_fs_devices *fs_devices = fs_info->fs_devices;

	struct btrfs_device *dev;



	error = btrfs_sysfs_add_device(fs_devices);
@@ -752,7 +751,7 @@ int btrfs_sysfs_add_one(struct btrfs_fs_info *fs_info) 
	if (error)

		return error;



	error = btrfs_kobj_add_device(fs_info, NULL);

	error = btrfs_kobj_add_device(fs_devs, NULL);

	if (error) {

		btrfs_sysfs_remove_fsid(fs_devs);

		return error;

fs/btrfs/sysfs.h

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ char *btrfs_printable_features(enum btrfs_feature_set set, u64 flags); 
extern const char * const btrfs_feature_set_names[3];

extern struct kobj_type space_info_ktype;

extern struct kobj_type btrfs_raid_ktype;

int btrfs_kobj_add_device(struct btrfs_fs_info *fs_info,

int btrfs_kobj_add_device(struct btrfs_fs_devices *fs_devices,

		struct btrfs_device *one_device);

int btrfs_kobj_rm_device(struct btrfs_fs_info *fs_info,

                struct btrfs_device *one_device);

fs/btrfs/volumes.c

+1 −1
Original line number Diff line number Diff line
@@ -2215,7 +2215,7 @@ int btrfs_init_new_device(struct btrfs_root *root, char *device_path) 
				    tmp + 1);



	/* add sysfs device entry */

	btrfs_kobj_add_device(root->fs_info, device);

	btrfs_kobj_add_device(root->fs_info->fs_devices, device);



	/*

	 * we've got more storage, clear any full flags on the space