Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0909905 authored by Chengguang Xu's avatar Chengguang Xu Committed by Jan Kara
Browse files

ext2: change return code to -ENOMEM when failing memory allocation 



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: default avatarChengguang Xu <cgxu519@icloud.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent b72e632c

fs/ext2/super.c

+2 −2
Original line number Diff line number Diff line
@@ -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