In the following scenarios, F2FS cannot reclaim truncated space.

case 1: 
write file A, size is 1G | CP | truncate A to 1M | fsync A | SPO

case 2: 
CP | write file A, size is 1G | fsync A | truncate A to 1M | fsync A |SPO

During the recovery process, F2FS will recover file A,
but the 1-1G space cannot be reclaimed.

Signed-off-by: Wang Xiaojun <wangxiao...@vivo.com>
---
 fs/f2fs/f2fs.h     |  1 +
 fs/f2fs/recovery.c | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 46be7560548c..d37204567b66 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -459,6 +459,7 @@ struct fsync_inode_entry {
        struct inode *inode;    /* vfs inode pointer */
        block_t blkaddr;        /* block address locating the last fsync */
        block_t last_dentry;    /* block address locating the last dentry */
+       loff_t old_max_size;    /* old max file size for truncate */
 };
 
 #define nats_in_cursum(jnl)            (le16_to_cpu((jnl)->n_nats))
diff --git a/fs/f2fs/recovery.c b/fs/f2fs/recovery.c
index 4cb3a91801b4..2f482742857c 100644
--- a/fs/f2fs/recovery.c
+++ b/fs/f2fs/recovery.c
@@ -95,6 +95,7 @@ static struct fsync_inode_entry *add_fsync_inode(struct 
f2fs_sb_info *sbi,
        entry = f2fs_kmem_cache_alloc(fsync_entry_slab,
                                        GFP_F2FS_ZERO, true, NULL);
        entry->inode = inode;
+       entry->old_max_size = i_size_read(inode);
        list_add_tail(&entry->list, head);
 
        return entry;
@@ -828,6 +829,8 @@ static int recover_data(struct f2fs_sb_info *sbi, struct 
list_head *inode_list,
                                break;
                        }
                        recovered_inode++;
+                       if (entry->old_max_size < i_size_read(entry->inode))
+                               entry->old_max_size = i_size_read(entry->inode);
                }
                if (entry->last_dentry == blkaddr) {
                        err = recover_dentry(entry->inode, folio, dir_list);
@@ -844,8 +847,18 @@ static int recover_data(struct f2fs_sb_info *sbi, struct 
list_head *inode_list,
                }
                recovered_dnode++;
 
-               if (entry->blkaddr == blkaddr)
+               if (entry->blkaddr == blkaddr) {
+                       if (entry->old_max_size > i_size_read(entry->inode)) {
+                               err = f2fs_truncate_blocks(entry->inode,
+                                       i_size_read(entry->inode), false);
+                               if (err) {
+                                       f2fs_folio_put(folio, true);
+                                       break;
+                               }
+                               f2fs_mark_inode_dirty_sync(entry->inode, true);
+                       }
                        list_move_tail(&entry->list, tmp_inode_list);
+               }
 next:
                ra_blocks = adjust_por_ra_blocks(sbi, ra_blocks, blkaddr,
                                        next_blkaddr_of_node(folio));
-- 
2.34.1



_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

Reply via email to