f2fs: update multi-dev metadata in resize_fs

Multi-device metadata should be updated in resize_fs as well.

Also, we check that the new FS size still reaches the last device.

Signed-off-by: Qiuyang Sun <sunqiuyang@huawei.com>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
index 5877bd7..ef7686a 100644 (file)
--- a/fs/f2fs/gc.c
+++ b/fs/f2fs/gc.c
@@ -1437,11 +1437,20 @@ static void update_sb_metadata(struct f2fs_sb_info *sbi, int secs)
        raw_sb->segment_count_main = cpu_to_le32(segment_count_main + segs);
        raw_sb->block_count = cpu_to_le64(block_count +
                                        (long long)segs * sbi->blocks_per_seg);
+       if (f2fs_is_multi_device(sbi)) {
+               int last_dev = sbi->s_ndevs - 1;
+               int dev_segs =
+                       le32_to_cpu(raw_sb->devs[last_dev].total_segments);
+
+               raw_sb->devs[last_dev].total_segments =
+                                               cpu_to_le32(dev_segs + segs);
+       }
 }
 
 static void update_fs_metadata(struct f2fs_sb_info *sbi, int secs)
 {
        int segs = secs * sbi->segs_per_sec;
+       long long blks = (long long)segs * sbi->blocks_per_seg;
        long long user_block_count =
                                le64_to_cpu(F2FS_CKPT(sbi)->user_block_count);
 
@@ -1449,8 +1458,20 @@ static void update_fs_metadata(struct f2fs_sb_info *sbi, int secs)
        MAIN_SEGS(sbi) = (int)MAIN_SEGS(sbi) + segs;
        FREE_I(sbi)->free_sections = (int)FREE_I(sbi)->free_sections + secs;
        FREE_I(sbi)->free_segments = (int)FREE_I(sbi)->free_segments + segs;
-       F2FS_CKPT(sbi)->user_block_count = cpu_to_le64(user_block_count +
-                                       (long long)segs * sbi->blocks_per_seg);
+       F2FS_CKPT(sbi)->user_block_count = cpu_to_le64(user_block_count + blks);
+
+       if (f2fs_is_multi_device(sbi)) {
+               int last_dev = sbi->s_ndevs - 1;
+
+               FDEV(last_dev).total_segments =
+                               (int)FDEV(last_dev).total_segments + segs;
+               FDEV(last_dev).end_blk =
+                               (long long)FDEV(last_dev).end_blk + blks;
+#ifdef CONFIG_BLK_DEV_ZONED
+               FDEV(last_dev).nr_blkz = (int)FDEV(last_dev).nr_blkz +
+                                       (int)(blks >> sbi->log_blocks_per_blkz);
+#endif
+       }
 }
 
 int f2fs_resize_fs(struct f2fs_sb_info *sbi, __u64 block_count)
@@ -1465,6 +1486,15 @@ int f2fs_resize_fs(struct f2fs_sb_info *sbi, __u64 block_count)
        if (block_count > old_block_count)
                return -EINVAL;
 
+       if (f2fs_is_multi_device(sbi)) {
+               int last_dev = sbi->s_ndevs - 1;
+               __u64 last_segs = FDEV(last_dev).total_segments;
+
+               if (block_count + last_segs * sbi->blocks_per_seg <=
+                                                               old_block_count)
+                       return -EINVAL;
+       }
+
        /* new fs size should align to section size */
        div_u64_rem(block_count, BLKS_PER_SEC(sbi), &rem);
        if (rem)