Merge tag 'for-5.11/block-2020-12-14' of git://git.kernel.dk/linux-block

[platform/kernel/linux-starfive.git] / fs / btrfs / sysfs.c

diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
index 4522a1c..19b9fff 100644 (file)
--- a/fs/btrfs/sysfs.c
+++ b/fs/btrfs/sysfs.c
@@ -1343,8 +1343,6 @@ int btrfs_sysfs_add_space_info_type(struct btrfs_fs_info *fs_info,
 
 void btrfs_sysfs_remove_device(struct btrfs_device *device)
 {
-       struct hd_struct *disk;
-       struct kobject *disk_kobj;
        struct kobject *devices_kobj;
 
        /*
@@ -1354,11 +1352,8 @@ void btrfs_sysfs_remove_device(struct btrfs_device *device)
        devices_kobj = device->fs_info->fs_devices->devices_kobj;
        ASSERT(devices_kobj);
 
-       if (device->bdev) {
-               disk = device->bdev->bd_part;
-               disk_kobj = &part_to_dev(disk)->kobj;
-               sysfs_remove_link(devices_kobj, disk_kobj->name);
-       }
+       if (device->bdev)
+               sysfs_remove_link(devices_kobj, bdev_kobj(device->bdev)->name);
 
        if (device->devid_kobj.state_initialized) {
                kobject_del(&device->devid_kobj);
@@ -1464,11 +1459,7 @@ int btrfs_sysfs_add_device(struct btrfs_device *device)
        nofs_flag = memalloc_nofs_save();
 
        if (device->bdev) {
-               struct hd_struct *disk;
-               struct kobject *disk_kobj;
-
-               disk = device->bdev->bd_part;
-               disk_kobj = &part_to_dev(disk)->kobj;
+               struct kobject *disk_kobj = bdev_kobj(device->bdev);
 
                ret = sysfs_create_link(devices_kobj, disk_kobj, disk_kobj->name);
                if (ret) {