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>

diff --git a/fs/cifs/cifs_fs_sb.h b/fs/cifs/cifs_fs_sb.h
index 3f4f1487f714e5adf118138eac9fdbfc753095b3..69d26313d350ba902a8a52bb1b4e45a9d52fa1d3 100644 (file)
--- a/fs/cifs/cifs_fs_sb.h
+++ b/fs/cifs/cifs_fs_sb.h
@@ -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;

diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index 3af22c09d8ded57ecdbbbec94b78965e50421e1b..0932a3b225bed483a44232d629ba2064659a427c 100644 (file)
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -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",

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index f6aa37aa3bf07806faa22af5487a1d60be42884e..1c8b08c06ad7dbbc3d0ff34d79a7d40ecdebacd4 100644 (file)
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -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)

diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index bbdce32e978f8495e01b9cbff77c3a1b5c964d32..240d79e3aa14ea8aeba51766f9a7f4522d87577f 100644 (file)
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -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 */