f2fs-tools: fix to match with the start_sector

f2fs-tools uses ioctl BLKSSZGET to get sector_size, however, this ioctl
will return a value which may be larger than 512 (according to the value
of q->limits.logical_block_size), then this will be inconsistent with
the start_sector, since start_sector is got from ioctl HDIO_GETGEO and
is always in 512 size unit for a sector. To fix this problem, just
change the sector_size to the default value when computing with
start_sector. And fix sectors_per_blk as well.

Signed-off-by: Yunlong Song <yunlong.song@huawei.com>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fsck/resize.c b/fsck/resize.c
index 99a0bd1..9f02e4b 100644 (file)
--- a/fsck/resize.c
+++ b/fsck/resize.c
@@ -27,10 +27,10 @@ static int get_new_sb(struct f2fs_super_block *sb)
 
        zone_size_bytes = segment_size_bytes * segs_per_zone;
        zone_align_start_offset =
-               (c.start_sector * c.sector_size +
+               (c.start_sector * DEFAULT_SECTOR_SIZE +
                2 * F2FS_BLKSIZE + zone_size_bytes - 1) /
                zone_size_bytes * zone_size_bytes -
-               c.start_sector * c.sector_size;
+               c.start_sector * DEFAULT_SECTOR_SIZE;
 
        set_sb(segment_count, (c.target_sectors * c.sector_size -
                                zone_align_start_offset) / segment_size_bytes /

diff --git a/mkfs/f2fs_format.c b/mkfs/f2fs_format.c
index 3ab5236..e0c3cb8 100644 (file)
--- a/mkfs/f2fs_format.c
+++ b/mkfs/f2fs_format.c
@@ -212,18 +212,18 @@ static int f2fs_prepare_super_block(void)
        set_sb(block_count, c.total_sectors >> log_sectors_per_block);
 
        zone_align_start_offset =
-               (c.start_sector * c.sector_size +
+               (c.start_sector * DEFAULT_SECTOR_SIZE +
                2 * F2FS_BLKSIZE + zone_size_bytes - 1) /
                zone_size_bytes * zone_size_bytes -
-               c.start_sector * c.sector_size;
+               c.start_sector * DEFAULT_SECTOR_SIZE;
 
-       if (c.start_sector % c.sectors_per_blk) {
+       if (c.start_sector % DEFAULT_SECTORS_PER_BLOCK) {
                MSG(1, "\t%s: Align start sector number to the page unit\n",
                                c.zoned_mode ? "FAIL" : "WARN");
                MSG(1, "\ti.e., start sector: %d, ofs:%d (sects/page: %d)\n",
                                c.start_sector,
-                               c.start_sector % c.sectors_per_blk,
-                               c.sectors_per_blk);
+                               c.start_sector % DEFAULT_SECTORS_PER_BLOCK,
+                               DEFAULT_SECTORS_PER_BLOCK);
                if (c.zoned_mode)
                        return -1;
        }
@@ -235,7 +235,7 @@ static int f2fs_prepare_super_block(void)
                                        get_sb(segment0_blkaddr));
 
        if (c.zoned_mode && (get_sb(segment0_blkaddr) + c.start_sector /
-                                       c.sectors_per_blk) % c.zone_blocks) {
+                                       DEFAULT_SECTORS_PER_BLOCK) % c.zone_blocks) {
                MSG(1, "\tError: Unaligned segment0 block address %u\n",
                                get_sb(segment0_blkaddr));
                return -1;