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

btrfs: split and refactor btrfs_sysfs_remove_devices_dir 



Similar to btrfs_sysfs_add_devices_dir()'s refactoring, split
btrfs_sysfs_remove_devices_dir() so that we don't have to use the device
argument to indicate whether to free all devices or just one device.

Export btrfs_sysfs_remove_device() as device operations outside of
sysfs.c now calls this instead of btrfs_sysfs_remove_devices_dir().

btrfs_sysfs_remove_devices_dir() is renamed to
btrfs_sysfs_remove_fs_devices() to suite its new role.

Now, no one outside of sysfs.c calls btrfs_sysfs_remove_fs_devices()
so it is redeclared s static. And the same function had to be moved
before its first caller.

Reviewed-by: default avatarNikolay Borisov <nborisov@suse.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 cd36da2e

fs/btrfs/dev-replace.c

+1 −1
Original line number Diff line number Diff line
@@ -781,7 +781,7 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info, 
	mutex_unlock(&fs_info->fs_devices->device_list_mutex);



	/* replace the sysfs entry */

	btrfs_sysfs_remove_devices_dir(fs_info->fs_devices, src_device);

	btrfs_sysfs_remove_device(src_device);

	btrfs_sysfs_update_devid(tgt_device);

	if (test_bit(BTRFS_DEV_STATE_WRITEABLE, &src_device->dev_state))

		btrfs_scratch_superblocks(fs_info, src_device->bdev,

fs/btrfs/sysfs.c

+11 −16
Original line number Diff line number Diff line
@@ -972,6 +972,14 @@ void btrfs_sysfs_remove_fsid(struct btrfs_fs_devices *fs_devs) 
	}

}



static void btrfs_sysfs_remove_fs_devices(struct btrfs_fs_devices *fs_devices)

{

	struct btrfs_device *device;



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

		btrfs_sysfs_remove_device(device);

}



void btrfs_sysfs_remove_mounted(struct btrfs_fs_info *fs_info)

{

	struct kobject *fsid_kobj = &fs_info->fs_devices->fsid_kobj;
@@ -999,7 +1007,7 @@ void btrfs_sysfs_remove_mounted(struct btrfs_fs_info *fs_info) 
	addrm_unknown_feature_attrs(fs_info, false);

	sysfs_remove_group(fsid_kobj, &btrfs_feature_attr_group);

	sysfs_remove_files(fsid_kobj, btrfs_attrs);

	btrfs_sysfs_remove_devices_dir(fs_info->fs_devices, NULL);

	btrfs_sysfs_remove_fs_devices(fs_info->fs_devices);

}



static const char * const btrfs_feature_set_names[FEAT_MAX] = {
@@ -1186,7 +1194,7 @@ int btrfs_sysfs_add_space_info_type(struct btrfs_fs_info *fs_info, 
	return 0;

}



static void btrfs_sysfs_remove_device(struct btrfs_device *device)

void btrfs_sysfs_remove_device(struct btrfs_device *device)

{

	struct hd_struct *disk;

	struct kobject *disk_kobj;
@@ -1212,19 +1220,6 @@ static void btrfs_sysfs_remove_device(struct btrfs_device *device) 
	}

}



/* When @device is NULL, remove all devices link */

void btrfs_sysfs_remove_devices_dir(struct btrfs_fs_devices *fs_devices,

				    struct btrfs_device *device)

{

	if (device) {

		btrfs_sysfs_remove_device(device);

		return;

	}



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

		btrfs_sysfs_remove_device(device);

}



static ssize_t btrfs_devinfo_in_fs_metadata_show(struct kobject *kobj,

					         struct kobj_attribute *a,

					         char *buf)
@@ -1459,7 +1454,7 @@ int btrfs_sysfs_add_mounted(struct btrfs_fs_info *fs_info) 


	error = sysfs_create_files(fsid_kobj, btrfs_attrs);

	if (error) {

		btrfs_sysfs_remove_devices_dir(fs_devs, NULL);

		btrfs_sysfs_remove_fs_devices(fs_devs);

		return error;

	}

fs/btrfs/sysfs.h

+1 −2
Original line number Diff line number Diff line
@@ -15,8 +15,7 @@ enum btrfs_feature_set { 
char *btrfs_printable_features(enum btrfs_feature_set set, u64 flags);

const char *btrfs_feature_set_name(enum btrfs_feature_set set);

int btrfs_sysfs_add_device(struct btrfs_device *device);

void btrfs_sysfs_remove_devices_dir(struct btrfs_fs_devices *fs_devices,

				    struct btrfs_device *device);

void btrfs_sysfs_remove_device(struct btrfs_device *device);

int btrfs_sysfs_add_fsid(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);

fs/btrfs/volumes.c

+4 −4
Original line number Diff line number Diff line
@@ -2145,7 +2145,7 @@ int btrfs_rm_device(struct btrfs_fs_info *fs_info, const char *device_path, 
	if (device->bdev) {

		cur_devices->open_devices--;

		/* remove sysfs entry */

		btrfs_sysfs_remove_devices_dir(fs_devices, device);

		btrfs_sysfs_remove_device(device);

	}



	num_devices = btrfs_super_num_devices(fs_info->super_copy) - 1;
@@ -2246,7 +2246,7 @@ void btrfs_destroy_dev_replace_tgtdev(struct btrfs_device *tgtdev) 


	mutex_lock(&fs_devices->device_list_mutex);



	btrfs_sysfs_remove_devices_dir(fs_devices, tgtdev);

	btrfs_sysfs_remove_device(tgtdev);



	if (tgtdev->bdev)

		fs_devices->open_devices--;
@@ -2682,7 +2682,7 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, const char *device_path 
	return ret;



error_sysfs:

	btrfs_sysfs_remove_devices_dir(fs_devices, device);

	btrfs_sysfs_remove_device(device);

	mutex_lock(&fs_info->fs_devices->device_list_mutex);

	mutex_lock(&fs_info->chunk_mutex);

	list_del_rcu(&device->dev_list);