f2fs: fix to update i_ctime in __f2fs_setxattr()
authorChao Yu <chao@kernel.org>
Wed, 19 Jul 2023 13:50:45 +0000 (21:50 +0800)
committerJaegeuk Kim <jaegeuk@kernel.org>
Mon, 14 Aug 2023 20:41:09 +0000 (13:41 -0700)
generic/728       - output mismatch (see /media/fstests/results//generic/728.out.bad)
    --- tests/generic/728.out 2023-07-19 07:10:48.362711407 +0000
    +++ /media/fstests/results//generic/728.out.bad 2023-07-19 08:39:57.000000000 +0000
     QA output created by 728
    +Expected ctime to change after setxattr.
    +Expected ctime to change after removexattr.
     Silence is golden
    ...
    (Run 'diff -u /media/fstests/tests/generic/728.out /media/fstests/results//generic/728.out.bad'  to see the entire diff)
generic/729        1s

It needs to update i_ctime after {set,remove}xattr, fix it.

Signed-off-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
fs/f2fs/xattr.c

index 476b186b90a6c7c6c2e58d217dfa3ef816be7588..71bfa2391ab4753ef7c6cf0a2d160f2ea4319645 100644 (file)
@@ -757,17 +757,17 @@ static int __f2fs_setxattr(struct inode *inode, int index,
        if (index == F2FS_XATTR_INDEX_ENCRYPTION &&
                        !strcmp(name, F2FS_XATTR_NAME_ENCRYPTION_CONTEXT))
                f2fs_set_encrypted_inode(inode);
-       f2fs_mark_inode_dirty_sync(inode, true);
        if (!error && S_ISDIR(inode->i_mode))
                set_sbi_flag(F2FS_I_SB(inode), SBI_NEED_CP);
 
 same:
        if (is_inode_flag_set(inode, FI_ACL_MODE)) {
                inode->i_mode = F2FS_I(inode)->i_acl_mode;
-               inode->i_ctime = current_time(inode);
                clear_inode_flag(inode, FI_ACL_MODE);
        }
 
+       inode->i_ctime = current_time(inode);
+       f2fs_mark_inode_dirty_sync(inode, true);
 exit:
        kfree(base_addr);
        return error;