Commit 99bd9bfb authored by Zizhi Wo's avatar Zizhi Wo
Browse files

cachefiles: Clean up in cachefiles_commit_tmpfile() 

mainline inclusion
from mainline-v6.13-rc1
commit 09ecf8f5505465b5527a39dff4b159af62306eee
category: cleanup
bugzilla: https://gitee.com/openeuler/kernel/issues/IB5UKT

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=09ecf8f5505465b5527a39dff4b159af62306eee



--------------------------------

Currently, cachefiles_commit_tmpfile() will only be called if object->flags
is set to CACHEFILES_OBJECT_USING_TMPFILE. Only cachefiles_create_file()
and cachefiles_invalidate_cookie() set this flag. Both of these functions
replace object->file with the new tmpfile, and both are called by
fscache_cookie_state_machine(), so there are no concurrency issues.

So the equation "d_backing_inode(dentry) == file_inode(object->file)" in
cachefiles_commit_tmpfile() will never hold true according to the above
conditions. This patch removes this part of the redundant code and does not
involve any other logical changes.

Signed-off-by: default avatarZizhi Wo <wozizhi@huawei.com>
Link: https://lore.kernel.org/r/20241107110649.3980193-4-wozizhi@huawei.com


Acked-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent c31894c7

fs/cachefiles/namei.c

+0 −5
Original line number Diff line number Diff line
@@ -690,11 +690,6 @@ bool cachefiles_commit_tmpfile(struct cachefiles_cache *cache, 
	}



	if (!d_is_negative(dentry)) {

		if (d_backing_inode(dentry) == file_inode(object->file)) {

			success = true;

			goto out_dput;

		}



		ret = cachefiles_unlink(volume->cache, object, fan, dentry,

					FSCACHE_OBJECT_IS_STALE);

		if (ret < 0)