f2fs: fix to check return value of inc_valid_block_count()
authorChao Yu <chao@kernel.org>
Wed, 5 Apr 2023 14:45:36 +0000 (22:45 +0800)
committerJaegeuk Kim <jaegeuk@kernel.org>
Thu, 13 Apr 2023 23:37:57 +0000 (16:37 -0700)
In __replace_atomic_write_block(), we missed to check return value
of inc_valid_block_count(), for extreme testcase that f2fs image is
run out of space, it may cause inconsistent status in between SIT
table and total valid block count.

Cc: Daeho Jeong <daehojeong@google.com>
Fixes: 3db1de0e582c ("f2fs: change the current atomic write way")
Signed-off-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
fs/f2fs/segment.c

index 84e2e558ea99d5794df408375fbca2d87dfc213c..82430f80c5da735d0018fce9627f4dd385917a65 100644 (file)
@@ -246,10 +246,16 @@ retry:
        } else {
                blkcnt_t count = 1;
 
+               err = inc_valid_block_count(sbi, inode, &count);
+               if (err) {
+                       f2fs_put_dnode(&dn);
+                       return err;
+               }
+
                *old_addr = dn.data_blkaddr;
                f2fs_truncate_data_blocks_range(&dn, 1);
                dec_valid_block_count(sbi, F2FS_I(inode)->cow_inode, count);
-               inc_valid_block_count(sbi, inode, &count);
+
                f2fs_replace_block(sbi, &dn, dn.data_blkaddr, new_addr,
                                        ni.version, true, false);
        }