public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-04-13 09:59:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

f2fs: introduce function read_raw_super_block()

Browse source 
Introduce function read_raw_super_block() to hide reading raw super block and
the retry routine if the first sb is invalid.

Signed-off-by: Gu Zheng <guz.fnst@cn.fujitsu.com>
Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
This commit is contained in:
Gu Zheng 2013-10-14 18:47:11 +08:00 • committed by Jaegeuk Kim
parent b1838f8952
commit 9076a75f8e
1 changed files with 34 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
fs/f2fs/super.c
View file

@ -746,31 +746,48 @@ static void init_sb_info(struct f2fs_sb_info *sbi)
atomic_set(&sbi->nr_pages[i], 0); atomic_set(&sbi->nr_pages[i], 0);
} }
static int validate_superblock(struct super_block *sb, /*
* Read f2fs raw super block.
* Because we have two copies of super block, so read the first one at first,
* if the first one is invalid, move to read the second one.
*/
static int read_raw_super_block(struct super_block *sb,
struct f2fs_super_block **raw_super, struct f2fs_super_block **raw_super,
struct buffer_head **raw_super_buf, sector_t block) struct buffer_head **raw_super_buf)
{ {
const char *super = (block == 0 ? "first" : "second"); int block = 0;
/* read f2fs raw super block */ retry:
*raw_super_buf = sb_bread(sb, block); *raw_super_buf = sb_bread(sb, block);
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 %dth superblock",
super); block + 1);
if (block == 0) {
block++;
goto retry;
} else {
return -EIO; return -EIO;
} }
}
*raw_super = (struct f2fs_super_block *) *raw_super = (struct f2fs_super_block *)
((char *)(*raw_super_buf)->b_data + F2FS_SUPER_OFFSET); ((char *)(*raw_super_buf)->b_data + F2FS_SUPER_OFFSET);
/* sanity checking of raw super */ /* sanity checking of raw super */
if (!sanity_check_raw_super(sb, *raw_super)) if (sanity_check_raw_super(sb, *raw_super)) {
return 0; brelse(*raw_super_buf);
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 %dth superblock", block + 1);
if(block == 0) {
block++;
goto retry;
} else {
return -EINVAL; return -EINVAL;
} }
}
return 0;
}
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)
{ {
@ -791,14 +808,10 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent)
goto free_sbi; goto free_sbi;
} }
err = validate_superblock(sb, &raw_super, &raw_super_buf, 0); err = read_raw_super_block(sb, &raw_super, &raw_super_buf);
if (err) {
brelse(raw_super_buf);
/* check secondary superblock when primary failed */
err = validate_superblock(sb, &raw_super, &raw_super_buf, 1);
if (err) if (err)
goto free_sb_buf; goto free_sbi;
}
sb->s_fs_info = sbi; sb->s_fs_info = sbi;
/* init some FS parameters */ /* init some FS parameters */
sbi->active_logs = NR_CURSEG_TYPE; sbi->active_logs = NR_CURSEG_TYPE;