]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
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)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 17 Oct 2024 13:07:55 +0000 (15:07 +0200)
[ Upstream commit 8874ad7dae8d91d24cc87c545c0073b3b2da5688 ]

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>
Stable-dep-of: aaf8c0b9ae04 ("f2fs: reduce expensive checkpoint trigger frequency")
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/f2fs/xattr.c

index 4271bcc2738d14b14d90fdf32fa1bf7b86c5533f..a3a11678d414d3896ad5930a5119a5d49d0cae7e 100644 (file)
@@ -756,17 +756,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;