Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 363eb38b authored by Chao Yu's avatar Chao Yu Committed by Greg Kroah-Hartman
Browse files

f2fs: fix to update i_ctime in __f2fs_setxattr() 



[ 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: default avatarChao Yu <chao@kernel.org>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
Stable-dep-of: aaf8c0b9ae04 ("f2fs: reduce expensive checkpoint trigger frequency")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 97a5007f

fs/f2fs/xattr.c

+2 −2
Original line number Diff line number Diff line
@@ -737,17 +737,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:

	kvfree(base_addr);

	return error;