f2fs: Revert "f2fs: truncate blocks in batch in __complete_revoke_list()"

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
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 719329c1808c13c5d8c3294256d11bc9e20b4993..227e258361734f0f2e78dbe0e301ed82062d0005 100644 (file)
--- 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)