Btrfc: sysfs: fix, check if device_dir_kobj is init before destroy

Since the failure code in the btrfs_sysfs_add_one() can
call btrfs_sysfs_remove_one() even before device_dir_kobj
has been created we need to check if its null.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.cz>

diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
index f31fcec01e9cb7901c244fbb798430429190b9b7..6218d31a6912f680067444a2b3e42ec86e0ef403 100644 (file)
--- a/fs/btrfs/sysfs.c
+++ b/fs/btrfs/sysfs.c
@@ -522,10 +522,12 @@ void btrfs_sysfs_remove_one(struct btrfs_fs_info *fs_info)
                kobject_del(fs_info->space_info_kobj);
                kobject_put(fs_info->space_info_kobj);
        }
-       btrfs_kobj_rm_device(fs_info, NULL);
-       kobject_del(fs_info->device_dir_kobj);
-       kobject_put(fs_info->device_dir_kobj);
-       fs_info->device_dir_kobj = NULL;
+       if (fs_info->device_dir_kobj) {
+               btrfs_kobj_rm_device(fs_info, NULL);
+               kobject_del(fs_info->device_dir_kobj);
+               kobject_put(fs_info->device_dir_kobj);
+               fs_info->device_dir_kobj = NULL;
+       }
        addrm_unknown_feature_attrs(fs_info, false);
        sysfs_remove_group(&fs_info->super_kobj, &btrfs_feature_attr_group);
        __btrfs_sysfs_remove_one(fs_info);