Commit 6a50d71d authored by Steve French's avatar Steve French
Browse files

smb3: allow controlling maximum number of cached directories 



Allow adjusting the maximum number of cached directories per share
(defaults to 16) via mount parm "max_cached_dirs"

Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent feeec636

fs/smb/client/cached_dir.c

+4 −3
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ static void smb2_close_cached_fid(struct kref *ref); 


static struct cached_fid *find_or_create_cached_dir(struct cached_fids *cfids,

						    const char *path,

						    bool lookup_only)

						    bool lookup_only,

						    __u32 max_cached_dirs)

{

	struct cached_fid *cfid;
@@ -43,7 +44,7 @@ static struct cached_fid *find_or_create_cached_dir(struct cached_fids *cfids, 
		spin_unlock(&cfids->cfid_list_lock);

		return NULL;

	}

	if (cfids->num_entries >= MAX_CACHED_FIDS) {

	if (cfids->num_entries >= max_cached_dirs) {

		spin_unlock(&cfids->cfid_list_lock);

		return NULL;

	}
@@ -162,7 +163,7 @@ int open_cached_dir(unsigned int xid, struct cifs_tcon *tcon, 
	if (!utf16_path)

		return -ENOMEM;



	cfid = find_or_create_cached_dir(cfids, path, lookup_only);

	cfid = find_or_create_cached_dir(cfids, path, lookup_only, tcon->max_cached_dirs);

	if (cfid == NULL) {

		kfree(utf16_path);

		return -ENOENT;

fs/smb/client/cached_dir.h

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ struct cached_fid { 
	struct cached_dirents dirents;

};



#define MAX_CACHED_FIDS 16

/* default MAX_CACHED_FIDS is 16 */

struct cached_fids {

	/* Must be held when:

	 * - accessing the cfids->entries list

fs/smb/client/cifsfs.c

+2 −0
Original line number Diff line number Diff line
@@ -699,6 +699,8 @@ cifs_show_options(struct seq_file *s, struct dentry *root) 
		seq_printf(s, ",snapshot=%llu", tcon->snapshot_time);

	if (tcon->handle_timeout)

		seq_printf(s, ",handletimeout=%u", tcon->handle_timeout);

	if (tcon->max_cached_dirs != MAX_CACHED_FIDS)

		seq_printf(s, ",max_cached_dirs=%u", tcon->max_cached_dirs);



	/*

	 * Display file and directory attribute timeout in seconds.

fs/smb/client/cifsglob.h

+1 −0
Original line number Diff line number Diff line
@@ -1210,6 +1210,7 @@ struct cifs_tcon { 
	__u32 max_chunks;

	__u32 max_bytes_chunk;

	__u32 max_bytes_copy;

	__u32 max_cached_dirs;

#ifdef CONFIG_CIFS_FSCACHE

	u64 resource_id;		/* server resource id */

	struct fscache_volume *fscache;	/* cookie for share */

fs/smb/client/connect.c

+1 −0
Original line number Diff line number Diff line
@@ -2657,6 +2657,7 @@ cifs_get_tcon(struct cifs_ses *ses, struct smb3_fs_context *ctx) 
	tcon->retry = ctx->retry;

	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