ext2: change return code to -ENOMEM when failing memory allocation
authorChengguang Xu <cgxu519@icloud.com>
Mon, 26 Feb 2018 09:45:12 +0000 (17:45 +0800)
committerJan Kara <jack@suse.cz>
Fri, 2 Mar 2018 13:23:11 +0000 (14:23 +0100)
Change return code to -ENOMEM from -EINVAL when failing memory
allocation in fill_super(), meanwhile delete redundant initial
assignment of variable err.

Signed-off-by: Chengguang Xu <cgxu519@icloud.com>
Signed-off-by: Jan Kara <jack@suse.cz>
fs/ext2/super.c

index 7666c06..de16945 100644 (file)
@@ -827,7 +827,7 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
        unsigned long logic_sb_block;
        unsigned long offset = 0;
        unsigned long def_mount_opts;
-       long ret = -EINVAL;
+       long ret = -ENOMEM;
        int blocksize = BLOCK_SIZE;
        int db_count;
        int i, j;
@@ -835,7 +835,6 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
        int err;
        struct ext2_mount_options opts;
 
-       err = -ENOMEM;
        sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);
        if (!sbi)
                goto failed;
@@ -851,6 +850,7 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
        sbi->s_daxdev = dax_dev;
 
        spin_lock_init(&sbi->s_lock);
+       ret = -EINVAL;
 
        /*
         * See what the current blocksize for the device is, and