diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 67864ab376c89993e46fec34af5d25ede0da46a2..bd7e9c6c42c80f5ac65a2a8a43a2ad9f8508e407 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -1361,6 +1361,8 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent)
 
 free_kobj:
 	kobject_del(&sbi->s_kobj);
+	kobject_put(&sbi->s_kobj);
+	wait_for_completion(&sbi->s_kobj_unregister);
 free_proc:
 	if (sbi->s_proc) {
 		remove_proc_entry("segment_info", sbi->s_proc);