Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
[linux-drm-fsl-dcu.git] / fs / ext2 / super.c
index 5df3d2d8169c25c1af4f45ce77a5f062517049de..9f311d27b16f5a804150e5cce66ce0b1724e7cb8 100644 (file)
@@ -771,13 +771,13 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
        err = -ENOMEM;
        sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);
        if (!sbi)
-               goto failed_unlock;
+               goto failed;
 
        sbi->s_blockgroup_lock =
                kzalloc(sizeof(struct blockgroup_lock), GFP_KERNEL);
        if (!sbi->s_blockgroup_lock) {
                kfree(sbi);
-               goto failed_unlock;
+               goto failed;
        }
        sb->s_fs_info = sbi;
        sbi->s_sb_block = sb_block;
@@ -1130,7 +1130,7 @@ failed_sbi:
        sb->s_fs_info = NULL;
        kfree(sbi->s_blockgroup_lock);
        kfree(sbi);
-failed_unlock:
+failed:
        return ret;
 }