Commit c0d39e65 authored by Namjae Jeon's avatar Namjae Jeon Committed by Jaegeuk Kim
Browse files

f2fs: fix return values from validate superblock 



validate super block is not returning with proper values.
When failure from sb_bread it should reflect there is an EIO otherwise
it should return of EINVAL.
Returning, '1' is not conveying proper message as the return type.

Signed-off-by: default avatarNamjae Jeon <namjae.jeon@samsung.com>
Signed-off-by: default avatarAmit Sahrawat <a.sahrawat@samsung.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>
parent 7c909772

fs/f2fs/super.c

+7 −4
Original line number Diff line number Diff line
@@ -474,7 +474,7 @@ static int validate_superblock(struct super_block *sb, 
	if (!*raw_super_buf) {

		f2fs_msg(sb, KERN_ERR, "unable to read %s superblock",

				super);

		return 1;

		return -EIO;

	}



	*raw_super = (struct f2fs_super_block *)
@@ -486,7 +486,7 @@ static int validate_superblock(struct super_block *sb, 


	f2fs_msg(sb, KERN_ERR, "Can't find a valid F2FS filesystem "

				"in %s superblock", super);

	return 1;

	return -EINVAL;

}



static int f2fs_fill_super(struct super_block *sb, void *data, int silent)
@@ -509,9 +509,12 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) 
		goto free_sbi;

	}



	if (validate_superblock(sb, &raw_super, &raw_super_buf, 0)) {

	err = validate_superblock(sb, &raw_super, &raw_super_buf, 0);

	if (err) {

		brelse(raw_super_buf);

		if (validate_superblock(sb, &raw_super, &raw_super_buf, 1))

		/* check secondary superblock when primary failed */

		err = validate_superblock(sb, &raw_super, &raw_super_buf, 1);

		if (err)

			goto free_sb_buf;

	}

	/* init some FS parameters */

CRA Git | Maintained and supported by SUSTech CRA and CCSE