| Message ID | 20240506104140.776986-1-chao@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 186e7d71534df4589405925caca5597af7626c12 |
| Headers | show |
| Series | [f2fs-dev,1/5] f2fs: compress: fix to update i_compr_blocks correctly | expand |
Hello: This series was applied to jaegeuk/f2fs.git (dev) by Jaegeuk Kim <jaegeuk@kernel.org>: On Mon, 6 May 2024 18:41:36 +0800 you wrote: > Previously, we account reserved blocks and compressed blocks into > @compr_blocks, then, f2fs_i_compr_blocks_update(,compr_blocks) will > update i_compr_blocks incorrectly, fix it. > > Meanwhile, for the case all blocks in cluster were reserved, fix to > update dn->ofs_in_node correctly. > > [...] Here is the summary with links: - [f2fs-dev,1/5] f2fs: compress: fix to update i_compr_blocks correctly https://git.kernel.org/jaegeuk/f2fs/c/186e7d71534d - [f2fs-dev,2/5] f2fs: compress: fix error path of inc_valid_block_count() https://git.kernel.org/jaegeuk/f2fs/c/043c832371cd - [f2fs-dev,3/5] f2fs: compress: fix typo in f2fs_reserve_compress_blocks() https://git.kernel.org/jaegeuk/f2fs/c/a3a0bc6c2239 - [f2fs-dev,4/5] f2fs: compress: fix to cover {reserve, release}_compress_blocks() w/ cp_rwsem lock https://git.kernel.org/jaegeuk/f2fs/c/0a4ed2d97cb6 - [f2fs-dev,5/5] f2fs: compress: don't allow unaligned truncation on released compress inode (no matching commit) You are awesome, thank you!
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index 1761ad125f97..6c84485687d3 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -3641,7 +3641,8 @@ static int reserve_compress_blocks(struct dnode_of_data *dn, pgoff_t count, while (count) { int compr_blocks = 0; - blkcnt_t reserved; + blkcnt_t reserved = 0; + blkcnt_t to_reserved; int ret; for (i = 0; i < cluster_size; i++) { @@ -3661,20 +3662,26 @@ static int reserve_compress_blocks(struct dnode_of_data *dn, pgoff_t count, * fails in release_compress_blocks(), so NEW_ADDR * is a possible case. */ - if (blkaddr == NEW_ADDR || - __is_valid_data_blkaddr(blkaddr)) { + if (blkaddr == NEW_ADDR) { + reserved++; + continue; + } + if (__is_valid_data_blkaddr(blkaddr)) { compr_blocks++; continue; } } - reserved = cluster_size - compr_blocks; + to_reserved = cluster_size - compr_blocks - reserved; /* for the case all blocks in cluster were reserved */ - if (reserved == 1) + if (to_reserved == 1) { + dn->ofs_in_node += cluster_size; goto next; + } - ret = inc_valid_block_count(sbi, dn->inode, &reserved, false); + ret = inc_valid_block_count(sbi, dn->inode, + &to_reserved, false); if (unlikely(ret)) return ret; @@ -3685,7 +3692,7 @@ static int reserve_compress_blocks(struct dnode_of_data *dn, pgoff_t count, f2fs_i_compr_blocks_update(dn->inode, compr_blocks, true); - *reserved_blocks += reserved; + *reserved_blocks += to_reserved; next: count -= cluster_size; }
Previously, we account reserved blocks and compressed blocks into @compr_blocks, then, f2fs_i_compr_blocks_update(,compr_blocks) will update i_compr_blocks incorrectly, fix it. Meanwhile, for the case all blocks in cluster were reserved, fix to update dn->ofs_in_node correctly. Fixes: eb8fbaa53374 ("f2fs: compress: fix to check unreleased compressed cluster") Signed-off-by: Chao Yu <chao@kernel.org> --- fs/f2fs/file.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-)