UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

cifs: remove actimeo from cifs_sb 

Can now be accessed via the ctx

Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
This commit is contained in:
Ronnie Sahlberg 2020-11-10 12:34:48 +10:00 committed by Steve French
parent 8401e93678
commit af1e40d9ac
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fs/cifs/cifs_fs_sb.h
View File

@ -65,7 +65,6 @@ struct cifs_sb_info {
unsigned int bsize; unsigned int bsize;
unsigned int rsize; unsigned int rsize;
unsigned int wsize; unsigned int wsize;
unsigned long actimeo; /* attribute cache timeout (jiffies) */
atomic_t active; atomic_t active;
unsigned int mnt_cifs_flags; unsigned int mnt_cifs_flags;
struct delayed_work prune_tlinks; struct delayed_work prune_tlinks;

2
fs/cifs/cifsfs.c
View File

@ -632,7 +632,7 @@ cifs_show_options(struct seq_file *s, struct dentry *root)
if (tcon->handle_timeout) if (tcon->handle_timeout)
seq_printf(s, ",handletimeout=%u", tcon->handle_timeout); seq_printf(s, ",handletimeout=%u", tcon->handle_timeout);
/* convert actimeo and display it in seconds */ /* 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) if (tcon->ses->chan_max > 1)
seq_printf(s, ",multichannel,max_channels=%zu", seq_printf(s, ",multichannel,max_channels=%zu",

3
fs/cifs/connect.c
View File

@ -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)) if (strcmp(old->local_nls->charset, new->local_nls->charset))
return 0; return 0;
if (old->actimeo != new->actimeo) if (old->ctx->actimeo != new->ctx->actimeo)
return 0; return 0;
return 1; 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_dbg(FYI, "file mode: %04ho dir mode: %04ho\n",
cifs_sb->ctx->file_mode, cifs_sb->ctx->dir_mode); cifs_sb->ctx->file_mode, cifs_sb->ctx->dir_mode);
cifs_sb->actimeo = ctx->actimeo;
cifs_sb->local_nls = ctx->local_nls; cifs_sb->local_nls = ctx->local_nls;
if (ctx->nodfs) if (ctx->nodfs)

4
fs/cifs/inode.c
View File

@ -2198,11 +2198,11 @@ cifs_inode_needs_reval(struct inode *inode)
if (!lookupCacheEnabled) if (!lookupCacheEnabled)
return true; return true;
if (!cifs_sb->actimeo) if (!cifs_sb->ctx->actimeo)
return true; return true;
if (!time_in_range(jiffies, cifs_i->time, if (!time_in_range(jiffies, cifs_i->time,
cifs_i->time + cifs_sb->actimeo)) cifs_i->time + cifs_sb->ctx->actimeo))
return true; return true;
/* hardlinked files w/ noserverino get "special" treatment */ /* hardlinked files w/ noserverino get "special" treatment */