[PATCH v2] f2fs-tools: remove unnecessary alignment for blocks_for_ssa

Daeho Jeong posted 1 patch 2 days, 3 hours ago
mkfs/f2fs_format.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
[PATCH v2] f2fs-tools: remove unnecessary alignment for blocks_for_ssa
Posted by Daeho Jeong 2 days, 3 hours ago
From: Daeho Jeong <daehojeong@google.com>

total_valid_blks_available is already a multiple of c.blks_per_seg.
So, we don't need an additional alignment adjustment.

Signed-off-by: Daeho Jeong <daehojeong@google.com>
Reviewed-by: Chao Yu <chao@kernel.org>
---
v2: add ASSERT() to ensure total_valid_blks_available is a multiple of
    c.blks_per_seg
---
 mkfs/f2fs_format.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/mkfs/f2fs_format.c b/mkfs/f2fs_format.c
index b98976c..6deb671 100644
--- a/mkfs/f2fs_format.c
+++ b/mkfs/f2fs_format.c
@@ -497,11 +497,12 @@ static int f2fs_prepare_super_block(void)
 			get_sb(segment_count_nat))) *
 			c.blks_per_seg;
 
-	if (c.feature & F2FS_FEATURE_RO)
+	if (c.feature & F2FS_FEATURE_RO) {
 		blocks_for_ssa = 0;
-	else
-		blocks_for_ssa = total_valid_blks_available /
-				c.blks_per_seg + 1;
+	} else {
+		ASSERT((total_valid_blks_available % c.blks_per_seg) == 0);
+		blocks_for_ssa = total_valid_blks_available / c.blks_per_seg;
+	}
 
 	set_sb(segment_count_ssa, SEG_ALIGN(blocks_for_ssa));
 
-- 
2.51.0.570.gb178f27e6d-goog