diff options
| author | Jaegeuk Kim <jaegeuk@kernel.org> | 2020-12-17 08:39:01 -0800 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2020-12-23 11:32:32 -0800 |
| commit | cc57f2c7da222fd8ddf607e82ad3c19736d71757 (patch) | |
| tree | af55bfa407f86b5008b634b0099b79d7ce5c7773 | |
| parent | ff7172e69f207e75b88d7f392b29385119ceb267 (diff) | |
| download | f2fs-tools-cc57f2c7da222fd8ddf607e82ad3c19736d71757.tar.gz | |
fsck.f2fs: fix alignment on multi-partition support
- mkfs.f2fs -s 4 -c second_dev first_dev
- fsck.f2fs first
Info: Segments per section = 1
Info: Sections per zone = 1
Info: sector size = 512
Info: total sectors = 69668488 (34017 MB)
Segment count (19128) mismatch with total segments from devices (19130) Can't find a valid F2FS superblock at 0x0
Segment count (19128) mismatch with total segments from devices (19130) Can't find a valid F2FS superblock at 0x1
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
| -rw-r--r-- | fsck/mount.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fsck/mount.c b/fsck/mount.c index fc3ecb9..6b2f17e 100644 --- a/fsck/mount.c +++ b/fsck/mount.c @@ -793,7 +793,7 @@ static int verify_sb_chksum(struct f2fs_super_block *sb) int sanity_check_raw_super(struct f2fs_super_block *sb, enum SB_ADDR sb_addr) { unsigned int blocksize; - unsigned int segment_count, segs_per_sec, secs_per_zone; + unsigned int segment_count, segs_per_sec, secs_per_zone, segs_per_zone; unsigned int total_sections, blocks_per_seg; if ((get_sb(feature) & F2FS_FEATURE_SB_CHKSUM) && @@ -845,6 +845,7 @@ int sanity_check_raw_super(struct f2fs_super_block *sb, enum SB_ADDR sb_addr) segs_per_sec = get_sb(segs_per_sec); secs_per_zone = get_sb(secs_per_zone); total_sections = get_sb(section_count); + segs_per_zone = segs_per_sec * secs_per_zone; /* blocks_per_seg should be 512, given the above check */ blocks_per_seg = 1 << get_sb(log_blocks_per_seg); @@ -883,7 +884,7 @@ int sanity_check_raw_super(struct f2fs_super_block *sb, enum SB_ADDR sb_addr) dev_segs += le32_to_cpu(sb->devs[i].total_segments); i++; } - if (segment_count != dev_segs) { + if (segment_count != dev_segs / segs_per_zone * segs_per_zone) { MSG(0, "Segment count (%u) mismatch with total segments from devices (%u)", segment_count, dev_segs); return 1; |