Commit 3b8bb317 authored by Paulo Alcantara's avatar Paulo Alcantara Committed by Steve French
Browse files

smb: client: do not start laundromat thread on nohandlecache 



Honor 'nohandlecache' mount option by not starting laundromat thread
even when SMB server supports directory leases. Do not waste system
resources by having laundromat thread running with no directory
caching at all.

Fixes: 2da338ff ("smb3: do not start laundromat thread when dir leases  disabled")
Signed-off-by: default avatarPaulo Alcantara (SUSE) <pc@manguebit.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent cedc019b

fs/smb/client/connect.c

+8 −8
Original line number Diff line number Diff line
@@ -2474,8 +2474,9 @@ cifs_put_tcon(struct cifs_tcon *tcon) 
static struct cifs_tcon *

cifs_get_tcon(struct cifs_ses *ses, struct smb3_fs_context *ctx)

{

	int rc, xid;

	struct cifs_tcon *tcon;

	bool nohandlecache;

	int rc, xid;



	tcon = cifs_find_tcon(ses, ctx);

	if (tcon) {
@@ -2493,14 +2494,17 @@ cifs_get_tcon(struct cifs_ses *ses, struct smb3_fs_context *ctx) 
		goto out_fail;

	}



	if (ses->server->capabilities & SMB2_GLOBAL_CAP_DIRECTORY_LEASING)

		tcon = tcon_info_alloc(true);

	if (ses->server->dialect >= SMB20_PROT_ID &&

	    (ses->server->capabilities & SMB2_GLOBAL_CAP_DIRECTORY_LEASING))

		nohandlecache = ctx->nohandlecache;

	else

		tcon = tcon_info_alloc(false);

		nohandlecache = true;

	tcon = tcon_info_alloc(!nohandlecache);

	if (tcon == NULL) {

		rc = -ENOMEM;

		goto out_fail;

	}

	tcon->nohandlecache = nohandlecache;



	if (ctx->snapshot_time) {

		if (ses->server->vals->protocol_id == 0) {
@@ -2662,10 +2666,6 @@ cifs_get_tcon(struct cifs_ses *ses, struct smb3_fs_context *ctx) 
	tcon->nocase = ctx->nocase;

	tcon->broken_sparse_sup = ctx->no_sparse;

	tcon->max_cached_dirs = ctx->max_cached_dirs;

	if (ses->server->capabilities & SMB2_GLOBAL_CAP_DIRECTORY_LEASING)

		tcon->nohandlecache = ctx->nohandlecache;

	else

		tcon->nohandlecache = true;

	tcon->nodelete = ctx->nodelete;

	tcon->local_lease = ctx->local_lease;

	INIT_LIST_HEAD(&tcon->pending_opens);