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

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: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarJosef Bacik <josef@toxicpanda.com>
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 6a416a01

fs/btrfs/dev-replace.c

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

	atomic64_set(&dev_replace->num_uncorrectable_read_errors, 0);

	up_write(&dev_replace->rwsem);

	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)

	if (ret)

		btrfs_err(fs_info, "kobj add dev failed %d", ret);

		btrfs_err(fs_info, "kobj add dev failed %d", ret);

fs/btrfs/sysfs.c

+4 −7
Original line number Original line Diff line number Diff line
@@ -1303,7 +1303,7 @@ static struct kobj_type devid_ktype = { 
	.release	= btrfs_release_devid_kobj,

	.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;

	int ret;

	unsigned int nofs_flag;

	unsigned int nofs_flag;
@@ -1352,13 +1352,10 @@ static int btrfs_sysfs_add_device(struct btrfs_device *device) 
	return ret;

	return ret;

}

}





int btrfs_sysfs_add_devices_dir(struct btrfs_fs_devices *fs_devices,

static int btrfs_sysfs_add_fs_devices(struct btrfs_fs_devices *fs_devices)

				struct btrfs_device *device)

{

{

	int ret;

	int ret;



	struct btrfs_device *device;

	if (device)

		return btrfs_sysfs_add_device(device);





	list_for_each_entry(device, &fs_devices->devices, dev_list) {

	list_for_each_entry(device, &fs_devices->devices, dev_list) {

		ret = btrfs_sysfs_add_device(device);

		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 btrfs_fs_devices *fs_devs = fs_info->fs_devices;

	struct kobject *fsid_kobj = &fs_devs->fsid_kobj;

	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)

	if (error)

		return error;

		return error;

fs/btrfs/sysfs.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -14,8 +14,7 @@ enum btrfs_feature_set { 




char *btrfs_printable_features(enum btrfs_feature_set set, u64 flags);

char *btrfs_printable_features(enum btrfs_feature_set set, u64 flags);

const char *btrfs_feature_set_name(enum btrfs_feature_set set);

const char *btrfs_feature_set_name(enum btrfs_feature_set set);

int btrfs_sysfs_add_devices_dir(struct btrfs_fs_devices *fs_devices,

int btrfs_sysfs_add_device(struct btrfs_device *device);

		struct btrfs_device *one_device);

void btrfs_sysfs_remove_devices_dir(struct btrfs_fs_devices *fs_devices,

void btrfs_sysfs_remove_devices_dir(struct btrfs_fs_devices *fs_devices,

				    struct btrfs_device *device);

				    struct btrfs_device *device);

int btrfs_sysfs_add_fsid(struct btrfs_fs_devices *fs_devs);

int btrfs_sysfs_add_fsid(struct btrfs_fs_devices *fs_devs);

fs/btrfs/volumes.c

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

	mutex_unlock(&fs_info->chunk_mutex);





	/* Add sysfs device entry */

	/* Add sysfs device entry */

	btrfs_sysfs_add_devices_dir(fs_devices, device);

	btrfs_sysfs_add_device(device);





	mutex_unlock(&fs_devices->device_list_mutex);

	mutex_unlock(&fs_devices->device_list_mutex);