Commit af1e40d9 authored by Ronnie Sahlberg's avatar Ronnie Sahlberg Committed by Steve French
Browse files

cifs: remove actimeo from cifs_sb 



Can now be accessed via the ctx

Signed-off-by: default avatarRonnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 8401e936

fs/cifs/cifs_fs_sb.h

+0 −1
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ struct cifs_sb_info { 
	unsigned int bsize;

	unsigned int rsize;

	unsigned int wsize;

	unsigned long actimeo; /* attribute cache timeout (jiffies) */

	atomic_t active;

	unsigned int mnt_cifs_flags;

	struct delayed_work prune_tlinks;

fs/cifs/cifsfs.c

+1 −1
Original line number Diff line number Diff line
@@ -632,7 +632,7 @@ cifs_show_options(struct seq_file *s, struct dentry *root) 
	if (tcon->handle_timeout)

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

	/* convert actimeo and display it in seconds */

	seq_printf(s, ",actimeo=%lu", cifs_sb->actimeo / HZ);

	seq_printf(s, ",actimeo=%lu", cifs_sb->ctx->actimeo / HZ);



	if (tcon->ses->chan_max > 1)

		seq_printf(s, ",multichannel,max_channels=%zu",

fs/cifs/connect.c

+1 −2
Original line number Diff line number Diff line
@@ -2251,7 +2251,7 @@ compare_mount_options(struct super_block *sb, struct cifs_mnt_data *mnt_data) 
	if (strcmp(old->local_nls->charset, new->local_nls->charset))

		return 0;



	if (old->actimeo != new->actimeo)

	if (old->ctx->actimeo != new->ctx->actimeo)

		return 0;



	return 1;
@@ -2711,7 +2711,6 @@ int cifs_setup_cifs_sb(struct smb3_fs_context *ctx, 
	cifs_dbg(FYI, "file mode: %04ho  dir mode: %04ho\n",

		 cifs_sb->ctx->file_mode, cifs_sb->ctx->dir_mode);



	cifs_sb->actimeo = ctx->actimeo;

	cifs_sb->local_nls = ctx->local_nls;



	if (ctx->nodfs)

fs/cifs/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -2198,11 +2198,11 @@ cifs_inode_needs_reval(struct inode *inode) 
	if (!lookupCacheEnabled)

		return true;



	if (!cifs_sb->actimeo)

	if (!cifs_sb->ctx->actimeo)

		return true;



	if (!time_in_range(jiffies, cifs_i->time,

				cifs_i->time + cifs_sb->actimeo))

				cifs_i->time + cifs_sb->ctx->actimeo))

		return true;



	/* hardlinked files w/ noserverino get "special" treatment */