| Message ID | 20240821024301.1058918-6-wozizhi@huawei.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | netfs/cachefiles: Some bugfixes | expand |
Zizhi Wo <wozizhi@huawei.com> wrote: > 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> Yeah, that's reasonable - and if it did hold true, all we do is unlink and relink it. Acked-by: David Howells <dhowells@redhat.com>
diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c index 70b0b3477085..ce9d558ae4fa 100644 --- a/fs/cachefiles/namei.c +++ b/fs/cachefiles/namei.c @@ -700,11 +700,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)
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> --- fs/cachefiles/namei.c | 5 ----- 1 file changed, 5 deletions(-)