| Message ID | 20230405144536.930370-1-chao@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 935fc6fa6466cf18dd72dd1518ebc7bfc4cd58a4 |
| Headers | show |
| Series | [f2fs-dev] f2fs: fix to check return value of inc_valid_block_count() | expand |
Hello: This patch was applied to jaegeuk/f2fs.git (dev) by Jaegeuk Kim <jaegeuk@kernel.org>: On Wed, 5 Apr 2023 22:45:36 +0800 you wrote: > 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> > > [...] Here is the summary with links: - [f2fs-dev] f2fs: fix to check return value of inc_valid_block_count() https://git.kernel.org/jaegeuk/f2fs/c/935fc6fa6466 You are awesome, thank you!
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index fc0734e4fb92..17203e8b865a 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -246,10 +246,16 @@ static int __replace_atomic_write_block(struct inode *inode, pgoff_t index, } 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); }
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> --- fs/f2fs/segment.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)