Merge tag 'sunxi-late-for-4.2' of https://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / fs / btrfs / sysfs.c

diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
index ea81a057c79b98798a454bfbbf93bc50fb39c724..603b0cc2b9bbf627f0b07fec3dad216164e6ddf3 100644 (file)
--- a/fs/btrfs/sysfs.c
+++ b/fs/btrfs/sysfs.c
@@ -523,9 +523,11 @@ static void __btrfs_sysfs_remove_fsid(struct btrfs_fs_devices *fs_devs)
                fs_devs->device_dir_kobj = NULL;
        }
 
-       kobject_del(&fs_devs->super_kobj);
-       kobject_put(&fs_devs->super_kobj);
-       wait_for_completion(&fs_devs->kobj_unregister);
+       if (fs_devs->super_kobj.state_initialized) {
+               kobject_del(&fs_devs->super_kobj);
+               kobject_put(&fs_devs->super_kobj);
+               wait_for_completion(&fs_devs->kobj_unregister);
+       }
 }
 
 /* when fs_devs is NULL it will remove all fsid kobject */