| Message ID | 20230214235719.799831-1-jaegeuk@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | c7dbc06688292db34c1bb9c715e29ac4935af994 |
| Headers | show |
| Series | [f2fs-dev] f2fs: Revert "f2fs: truncate blocks in batch in __complete_revoke_list()" | expand |
On 2023/2/15 7:57, Jaegeuk Kim wrote: > We should not truncate replaced blocks, and were supposed to truncate the first > part as well. > > This reverts commit 78a99fe6254cad4be310cd84af39f6c46b668c72. > > Cc: stable@vger.kernel.org > Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org> Oh, my bad, thanks for fixing this. Reviewed-by: Chao Yu <chao@kernel.org> Thanks,
Hello: This patch was applied to jaegeuk/f2fs.git (dev) by Jaegeuk Kim <jaegeuk@kernel.org>: On Tue, 14 Feb 2023 15:57:19 -0800 you wrote: > We should not truncate replaced blocks, and were supposed to truncate the first > part as well. > > This reverts commit 78a99fe6254cad4be310cd84af39f6c46b668c72. > > Cc: stable@vger.kernel.org > Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org> > > [...] Here is the summary with links: - [f2fs-dev] f2fs: Revert "f2fs: truncate blocks in batch in __complete_revoke_list()" https://git.kernel.org/jaegeuk/f2fs/c/c7dbc0668829 You are awesome, thank you!
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index 719329c1808c..227e25836173 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -265,19 +265,24 @@ static void __complete_revoke_list(struct inode *inode, struct list_head *head, bool revoke) { struct revoke_entry *cur, *tmp; + pgoff_t start_index = 0; bool truncate = is_inode_flag_set(inode, FI_ATOMIC_REPLACE); list_for_each_entry_safe(cur, tmp, head, list) { - if (revoke) + if (revoke) { __replace_atomic_write_block(inode, cur->index, cur->old_addr, NULL, true); + } else if (truncate) { + f2fs_truncate_hole(inode, start_index, cur->index); + start_index = cur->index + 1; + } list_del(&cur->list); kmem_cache_free(revoke_entry_slab, cur); } if (!revoke && truncate) - f2fs_do_truncate_blocks(inode, 0, false); + f2fs_do_truncate_blocks(inode, start_index * PAGE_SIZE, false); } static int __f2fs_commit_atomic_write(struct inode *inode)
We should not truncate replaced blocks, and were supposed to truncate the first part as well. This reverts commit 78a99fe6254cad4be310cd84af39f6c46b668c72. Cc: stable@vger.kernel.org Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org> --- fs/f2fs/segment.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)