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: Namjae Jeon <namjae.jeon@samsung.com> Signed-off-by: Amit Sahrawat <a.sahrawat@samsung.com> Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
This commit is contained in:
parent
7c909772f1
commit
c0d39e65ba
|
@ -474,7 +474,7 @@ static int validate_superblock(struct super_block *sb,
|
||||||
if (!*raw_super_buf) {
|
if (!*raw_super_buf) {
|
||||||
f2fs_msg(sb, KERN_ERR, "unable to read %s superblock",
|
f2fs_msg(sb, KERN_ERR, "unable to read %s superblock",
|
||||||
super);
|
super);
|
||||||
return 1;
|
return -EIO;
|
||||||
}
|
}
|
||||||
|
|
||||||
*raw_super = (struct f2fs_super_block *)
|
*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 "
|
f2fs_msg(sb, KERN_ERR, "Can't find a valid F2FS filesystem "
|
||||||
"in %s superblock", super);
|
"in %s superblock", super);
|
||||||
return 1;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int f2fs_fill_super(struct super_block *sb, void *data, int silent)
|
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;
|
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);
|
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;
|
goto free_sb_buf;
|
||||||
}
|
}
|
||||||
/* init some FS parameters */
|
/* init some FS parameters */
|
||||||
|
|
Loading…
Reference in New Issue