]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
cachefiles: Clean up in cachefiles_commit_tmpfile()
authorZizhi Wo <wozizhi@huawei.com>
Thu, 7 Nov 2024 11:06:47 +0000 (19:06 +0800)
committerChristian Brauner <brauner@kernel.org>
Mon, 11 Nov 2024 13:39:38 +0000 (14:39 +0100)
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: Zizhi Wo <wozizhi@huawei.com>
Link: https://lore.kernel.org/r/20241107110649.3980193-4-wozizhi@huawei.com
Acked-by: David Howells <dhowells@redhat.com>
Signed-off-by: Christian Brauner <brauner@kernel.org>
fs/cachefiles/namei.c

index 2b3f9935dbb44dddc871623ca712315aab1eede6..7cf59713f0f78d1efedc858f42f9bf819398c511 100644 (file)
@@ -691,11 +691,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)