]> git.hungrycats.org Git - linux/commitdiff
smb: client: disable directory caching when dir_cache_timeout is zero
authorHenrique Carvalho <henrique.carvalho@suse.com>
Sat, 23 Nov 2024 01:14:35 +0000 (22:14 -0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 9 Dec 2024 09:32:57 +0000 (10:32 +0100)
[ Upstream commit ceaf1451990e3ea7fb50aebb5a149f57945f6e9f ]

Setting dir_cache_timeout to zero should disable the caching of
directory contents. Currently, even when dir_cache_timeout is zero,
some caching related functions are still invoked, which is unintended
behavior.

Fix the issue by setting tcon->nohandlecache to true when
dir_cache_timeout is zero, ensuring that directory handle caching
is properly disabled.

Fixes: 238b351d0935 ("smb3: allow controlling length of time directory entries are cached with dir leases")
Reviewed-by: Paulo Alcantara (Red Hat) <pc@manguebit.com>
Reviewed-by: Enzo Matsumiya <ematsumiya@suse.de>
Signed-off-by: Henrique Carvalho <henrique.carvalho@suse.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/smb/client/connect.c

index 5cb6d1b47415d2f5bda5b47d4096af2be0bcfbdf..7b850c40b2f320d79e9aa168ae081bec2535f669 100644 (file)
@@ -2601,7 +2601,7 @@ cifs_get_tcon(struct cifs_ses *ses, struct smb3_fs_context *ctx)
 
        if (ses->server->dialect >= SMB20_PROT_ID &&
            (ses->server->capabilities & SMB2_GLOBAL_CAP_DIRECTORY_LEASING))
-               nohandlecache = ctx->nohandlecache;
+               nohandlecache = ctx->nohandlecache || !dir_cache_timeout;
        else
                nohandlecache = true;
        tcon = tcon_info_alloc(!nohandlecache, netfs_trace_tcon_ref_new);