f2fs: prevent atomic file from being dirtied before commit

[ Upstream commit fccaa81de87e80b1809906f7e438e5766fbdc172 ]

Keep atomic file clean while updating and make it dirtied during commit
in order to avoid unnecessary and excessive inode updates in the previous
fix.

Fixes: 4bf78322346f ("f2fs: mark inode dirty for FI_ATOMIC_COMMITTED flag")
Signed-off-by: Daeho Jeong <daehojeong@google.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index dbae5d441791096eb919c2b707bf0a0490a9c2e8..88ca80afffd3dae7bf081a3f9e5eeec0157933e9 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -803,6 +803,7 @@ enum {
        FI_ALIGNED_WRITE,       /* enable aligned write */
        FI_COW_FILE,            /* indicate COW file */
        FI_ATOMIC_COMMITTED,    /* indicate atomic commit completed except disk sync */
+       FI_ATOMIC_DIRTIED,      /* indicate atomic file is dirtied */
        FI_ATOMIC_REPLACE,      /* indicate atomic replace */
        FI_OPENED_FILE,         /* indicate file has been opened */
        FI_MAX,                 /* max flag, never be used */
@@ -3049,7 +3050,6 @@ static inline void __mark_inode_dirty_flag(struct inode *inode,
        case FI_INLINE_DOTS:
        case FI_PIN_FILE:
        case FI_COMPRESS_RELEASED:
-       case FI_ATOMIC_COMMITTED:
                f2fs_mark_inode_dirty_sync(inode, true);
        }
 }

diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c
index 57da02bfa823efe4efdf2be2bd6ada96c3a7ba52..0b23a0cb438fde3cddb822115b705cb11258dc12 100644 (file)
--- a/fs/f2fs/inode.c
+++ b/fs/f2fs/inode.c
@@ -35,6 +35,11 @@ void f2fs_mark_inode_dirty_sync(struct inode *inode, bool sync)
        if (f2fs_inode_dirtied(inode, sync))
                return;
 
+       if (f2fs_is_atomic_file(inode)) {
+               set_inode_flag(inode, FI_ATOMIC_DIRTIED);
+               return;
+       }
+
        mark_inode_dirty_sync(inode);
 }
 

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 601825785226d2181f49d44ee45c7dc640dbdb5d..06ddc80aa5e0d70376ef9a1501bd2d7241cec529 100644 (file)
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -199,6 +199,10 @@ void f2fs_abort_atomic_write(struct inode *inode, bool clean)
        clear_inode_flag(inode, FI_ATOMIC_COMMITTED);
        clear_inode_flag(inode, FI_ATOMIC_REPLACE);
        clear_inode_flag(inode, FI_ATOMIC_FILE);
+       if (is_inode_flag_set(inode, FI_ATOMIC_DIRTIED)) {
+               clear_inode_flag(inode, FI_ATOMIC_DIRTIED);
+               f2fs_mark_inode_dirty_sync(inode, true);
+       }
        stat_dec_atomic_inode(inode);
 
        F2FS_I(inode)->atomic_write_task = NULL;
@@ -366,6 +370,10 @@ out:
        } else {
                sbi->committed_atomic_block += fi->atomic_write_cnt;
                set_inode_flag(inode, FI_ATOMIC_COMMITTED);
+               if (is_inode_flag_set(inode, FI_ATOMIC_DIRTIED)) {
+                       clear_inode_flag(inode, FI_ATOMIC_DIRTIED);
+                       f2fs_mark_inode_dirty_sync(inode, true);
+               }
        }
 
        __complete_revoke_list(inode, &revoke_list, ret ? true : false);