Skip to content

Commit d22f243

Browse files
author
Jaegeuk Kim
committed
Revert "mkfs.f2fs: adjust zone alignment check to correct position"
This reverts commit 84447ee.
1 parent 35cc8f2 commit d22f243

1 file changed

Lines changed: 11 additions & 12 deletions

File tree

mkfs/f2fs_format.c

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,17 @@ static int f2fs_prepare_super_block(void)
339339
MSG(0, "Info: zone aligned segment0 blkaddr: %u\n",
340340
get_sb(segment0_blkaddr));
341341

342+
if (c.zoned_mode &&
343+
((c.ndevs == 1 &&
344+
(get_sb(segment0_blkaddr) + c.start_sector /
345+
DEFAULT_SECTORS_PER_BLOCK) % c.zone_blocks) ||
346+
(c.ndevs > 1 &&
347+
c.devices[1].start_blkaddr % c.zone_blocks))) {
348+
MSG(1, "\tError: Unaligned segment0 block address %u\n",
349+
get_sb(segment0_blkaddr));
350+
return -1;
351+
}
352+
342353
for (i = 0; i < c.ndevs; i++) {
343354
if (i == 0) {
344355
c.devices[i].total_segments =
@@ -379,18 +390,6 @@ static int f2fs_prepare_super_block(void)
379390

380391
c.total_segments += c.devices[i].total_segments;
381392
}
382-
383-
if (c.zoned_mode &&
384-
((c.ndevs == 1 &&
385-
(get_sb(segment0_blkaddr) + c.start_sector /
386-
DEFAULT_SECTORS_PER_BLOCK) % c.zone_blocks) ||
387-
(c.ndevs > 1 &&
388-
c.devices[1].start_blkaddr % c.zone_blocks))) {
389-
MSG(1, "\tError: Unaligned segment0 block address %u\n",
390-
get_sb(segment0_blkaddr));
391-
return -1;
392-
}
393-
394393
set_sb(segment_count, c.total_segments);
395394
set_sb(segment_count_ckpt, F2FS_NUMBER_OF_CHECKPOINT_PACK);
396395

0 commit comments

Comments
 (0)