AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

Btrfs: sysfs btrfs_kobj_add_device() pass fs_devices instead of fs_info

Browse Source 
btrfs_kobj_add_device() does not need fs_info any more.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
This commit is contained in:
Anand Jain 2015-03-10 06:38:33 +08:00 committed by David Sterba
parent 2e3e12815a
commit 1ba43816af
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/btrfs/dev-replace.c
View File

@ -584,7 +584,7 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info,
/* replace the sysfs entry */ /* replace the sysfs entry */
btrfs_kobj_rm_device(fs_info, src_device); 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); btrfs_rm_dev_replace_free_srcdev(fs_info, src_device);
/* write back the superblocks */ /* write back the superblocks */

7
fs/btrfs/sysfs.c
View File

@ -682,11 +682,10 @@ int btrfs_sysfs_add_device(struct btrfs_fs_devices *fs_devs)
return 0; 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) struct btrfs_device *one_device)
{ {
int error = 0; int error = 0;
struct btrfs_fs_devices *fs_devices = fs_info->fs_devices;
struct btrfs_device *dev; struct btrfs_device *dev;
error = btrfs_sysfs_add_device(fs_devices); error = btrfs_sysfs_add_device(fs_devices);
@ -752,7 +751,7 @@ int btrfs_sysfs_add_one(struct btrfs_fs_info *fs_info)
if (error) if (error)
return error; return error;
error = btrfs_kobj_add_device(fs_info, NULL); error = btrfs_kobj_add_device(fs_devs, NULL);
if (error) { if (error) {
btrfs_sysfs_remove_fsid(fs_devs); btrfs_sysfs_remove_fsid(fs_devs);
return error; return error;

2
fs/btrfs/sysfs.h
View File

@ -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 const char * const btrfs_feature_set_names[3];
extern struct kobj_type space_info_ktype; extern struct kobj_type space_info_ktype;
extern struct kobj_type btrfs_raid_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); struct btrfs_device *one_device);
int btrfs_kobj_rm_device(struct btrfs_fs_info *fs_info, int btrfs_kobj_rm_device(struct btrfs_fs_info *fs_info,
struct btrfs_device *one_device); struct btrfs_device *one_device);

2
fs/btrfs/volumes.c
View File

@ -2215,7 +2215,7 @@ int btrfs_init_new_device(struct btrfs_root *root, char *device_path)
tmp + 1); tmp + 1);
/* add sysfs device entry */ /* 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 * we've got more storage, clear any full flags on the space