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

btrfs: sysfs, rename devices kobject holder to devices_kobj

Browse Source 
The struct member btrfs_device::device_dir_kobj holds the kobj of the
sysfs directory /sys/fs/btrfs/UUID/devices, so rename it from
device_dir_kobj to devices_kobj. No functional changes.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Anand Jain 2019-11-21 17:33:30 +08:00 committed by David Sterba
parent db26a02449
commit b5501504cb
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
fs/btrfs/sysfs.c
View File

@ -734,10 +734,10 @@ static int addrm_unknown_feature_attrs(struct btrfs_fs_info *fs_info, bool add)
static void __btrfs_sysfs_remove_fsid(struct btrfs_fs_devices *fs_devs) static void __btrfs_sysfs_remove_fsid(struct btrfs_fs_devices *fs_devs)
{ {
if (fs_devs->device_dir_kobj) { if (fs_devs->devices_kobj) {
kobject_del(fs_devs->device_dir_kobj); kobject_del(fs_devs->devices_kobj);
kobject_put(fs_devs->device_dir_kobj); kobject_put(fs_devs->devices_kobj);
fs_devs->device_dir_kobj = NULL; fs_devs->devices_kobj = NULL;
} }
if (fs_devs->fsid_kobj.state_initialized) { if (fs_devs->fsid_kobj.state_initialized) {
@ -969,15 +969,14 @@ int btrfs_sysfs_rm_device_link(struct btrfs_fs_devices *fs_devices,
struct hd_struct *disk; struct hd_struct *disk;
struct kobject *disk_kobj; struct kobject *disk_kobj;
if (!fs_devices->device_dir_kobj) if (!fs_devices->devices_kobj)
return -EINVAL; return -EINVAL;
if (one_device && one_device->bdev) { if (one_device && one_device->bdev) {
disk = one_device->bdev->bd_part; disk = one_device->bdev->bd_part;
disk_kobj = &part_to_dev(disk)->kobj; disk_kobj = &part_to_dev(disk)->kobj;
sysfs_remove_link(fs_devices->device_dir_kobj, sysfs_remove_link(fs_devices->devices_kobj, disk_kobj->name);
disk_kobj->name);
} }
if (one_device) if (one_device)
@ -990,8 +989,7 @@ int btrfs_sysfs_rm_device_link(struct btrfs_fs_devices *fs_devices,
disk = one_device->bdev->bd_part; disk = one_device->bdev->bd_part;
disk_kobj = &part_to_dev(disk)->kobj; disk_kobj = &part_to_dev(disk)->kobj;
sysfs_remove_link(fs_devices->device_dir_kobj, sysfs_remove_link(fs_devices->devices_kobj, disk_kobj->name);
disk_kobj->name);
} }
return 0; return 0;
@ -999,11 +997,11 @@ int btrfs_sysfs_rm_device_link(struct btrfs_fs_devices *fs_devices,
int btrfs_sysfs_add_device(struct btrfs_fs_devices *fs_devs) int btrfs_sysfs_add_device(struct btrfs_fs_devices *fs_devs)
{ {
if (!fs_devs->device_dir_kobj) if (!fs_devs->devices_kobj)
fs_devs->device_dir_kobj = kobject_create_and_add("devices", fs_devs->devices_kobj = kobject_create_and_add("devices",
&fs_devs->fsid_kobj); &fs_devs->fsid_kobj);
if (!fs_devs->device_dir_kobj) if (!fs_devs->devices_kobj)
return -ENOMEM; return -ENOMEM;
return 0; return 0;
@ -1028,7 +1026,7 @@ int btrfs_sysfs_add_device_link(struct btrfs_fs_devices *fs_devices,
disk = dev->bdev->bd_part; disk = dev->bdev->bd_part;
disk_kobj = &part_to_dev(disk)->kobj; disk_kobj = &part_to_dev(disk)->kobj;
error = sysfs_create_link(fs_devices->device_dir_kobj, error = sysfs_create_link(fs_devices->devices_kobj,
disk_kobj, disk_kobj->name); disk_kobj, disk_kobj->name);
if (error) if (error)
break; break;

2
fs/btrfs/volumes.h
View File

@ -255,7 +255,7 @@ struct btrfs_fs_devices {
struct btrfs_fs_info *fs_info; struct btrfs_fs_info *fs_info;
/* sysfs kobjects */ /* sysfs kobjects */
struct kobject fsid_kobj; struct kobject fsid_kobj;
struct kobject *device_dir_kobj; struct kobject *devices_kobj;
struct completion kobj_unregister; struct completion kobj_unregister;
}; };