leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Btrfs: rename btrfs_kobj_add_device to btrfs_sysfs_add_device_link

Browse Source 
Signed-off-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Anand Jain
2015-08-14 18:32:48 +08:00
committed by David Sterba
parent 6618a59bfc
commit e3bd6973bc
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -375,7 +375,7 @@ int btrfs_dev_replace_start(struct btrfs_root *root,
WARN_ON(!tgt_device); WARN_ON(!tgt_device);
dev_replace->tgtdev = tgt_device; dev_replace->tgtdev = tgt_device;
ret = btrfs_kobj_add_device(tgt_device->fs_devices, tgt_device); ret = btrfs_sysfs_add_device_link(tgt_device->fs_devices, tgt_device);
if (ret) if (ret)
btrfs_err(root->fs_info, "kobj add dev failed %d\n", ret); btrfs_err(root->fs_info, "kobj add dev failed %d\n", ret);

4
fs/btrfs/sysfs.c
View File

@@ -683,7 +683,7 @@ int btrfs_sysfs_add_device(struct btrfs_fs_devices *fs_devs)
return 0; return 0;
} }
int btrfs_kobj_add_device(struct btrfs_fs_devices *fs_devices, int btrfs_sysfs_add_device_link(struct btrfs_fs_devices *fs_devices,
struct btrfs_device *one_device) struct btrfs_device *one_device)
{ {
int error = 0; int error = 0;
@@ -744,7 +744,7 @@ int btrfs_sysfs_add_mounted(struct btrfs_fs_info *fs_info)
btrfs_set_fs_info_ptr(fs_info); btrfs_set_fs_info_ptr(fs_info);
error = btrfs_kobj_add_device(fs_devs, NULL); error = btrfs_sysfs_add_device_link(fs_devs, NULL);
if (error) if (error)
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_devices *fs_devices, int btrfs_sysfs_add_device_link(struct btrfs_fs_devices *fs_devices,
struct btrfs_device *one_device); struct btrfs_device *one_device);
int btrfs_kobj_rm_device(struct btrfs_fs_devices *fs_devices, int btrfs_kobj_rm_device(struct btrfs_fs_devices *fs_devices,
struct btrfs_device *one_device); struct btrfs_device *one_device);

2
fs/btrfs/volumes.c
View File

@@ -2309,7 +2309,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->fs_devices, device); btrfs_sysfs_add_device_link(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