Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[firefly-linux-kernel-4.4.55.git] / fs / ext2 / super.c

diff --git a/fs/ext2/super.c b/fs/ext2/super.c
index 15761e638dae5e1a4fdc4d37094dee0abbacf2f7..af74d9e27b71b0cf569cac645e362c174c44389e 100644 (file)
--- a/fs/ext2/super.c
+++ b/fs/ext2/super.c
@@ -775,13 +775,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;
@@ -1134,7 +1134,7 @@ failed_sbi:
        sb->s_fs_info = NULL;
        kfree(sbi->s_blockgroup_lock);
        kfree(sbi);
-failed_unlock:
+failed:
        return ret;
 }