korg/f2fs-tools
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git synced 2024-11-27 03:33:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

mkfs.f2fs: adjust zone alignment when using convention partition with zoned one

Browse Source 
When formatting conventional partition with zoned one, we are already
aligning the starting block address of the next device to the zone size.
Therefore, we do not align the segment0 address to the zone alignment.
This reduces the wasted zone_align_start_offset.

Test result
segment0 blkaddr 389583 -> 119251
Add one additional section to main

Signed-off-by: Yohan Joung <yohan.joung@sk.com>
Reviewed-by: Daeho Jeong <daehojeong@google.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
This commit is contained in:
Yohan Joung 2024-10-29 22:45:51 +09:00 committed by Jaegeuk Kim
parent b7b6cacc34
commit 2893f7c6c5
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mkfs/f2fs_format.c
View File

@ -266,6 +266,7 @@ static int f2fs_prepare_super_block(void)
uint32_t log_sectorsize, log_sectors_per_block;
uint32_t log_blocksize, log_blks_per_seg;
uint32_t segment_size_bytes, zone_size_bytes;
uint32_t alignment_bytes;
uint32_t sit_segments, nat_segments;
uint32_t blocks_for_sit, blocks_for_nat, blocks_for_ssa;
uint32_t total_valid_blks_available;
@ -305,10 +306,12 @@ static int f2fs_prepare_super_block(void)
set_sb(block_count, c.total_sectors >> log_sectors_per_block);
alignment_bytes = c.zoned_mode && c.ndevs > 1 ? segment_size_bytes : zone_size_bytes;
zone_align_start_offset =
((uint64_t) c.start_sector * DEFAULT_SECTOR_SIZE +
2 * F2FS_BLKSIZE + zone_size_bytes - 1) /
zone_size_bytes * zone_size_bytes -
2 * F2FS_BLKSIZE + alignment_bytes - 1) /
alignment_bytes * alignment_bytes -
(uint64_t) c.start_sector * DEFAULT_SECTOR_SIZE;
if (c.feature & F2FS_FEATURE_RO)
@ -327,7 +330,8 @@ static int f2fs_prepare_super_block(void)
if (c.zoned_mode && c.ndevs > 1)
zone_align_start_offset +=
(c.devices[0].total_sectors * c.sector_size) % zone_size_bytes;
(c.devices[0].total_sectors * c.sector_size -
zone_align_start_offset) % zone_size_bytes;
set_sb(segment0_blkaddr, zone_align_start_offset / blk_size_bytes);
sb->cp_blkaddr = sb->segment0_blkaddr;