diff options
| author | Ronnie Sahlberg <lsahlber@redhat.com> | 2020-11-10 05:34:48 +0300 |
|---|---|---|
| committer | Steve French <stfrench@microsoft.com> | 2020-12-14 18:16:23 +0300 |
| commit | af1e40d9ac8417839d955ca1ac42f754588937a9 (patch) | |
| tree | abf76b4093c696a79e8943eb7c9bf806f3529981 | |
| parent | 8401e93678933a140cebfa2e7122c1a6b687c355 (diff) | |
| download | linux-af1e40d9ac8417839d955ca1ac42f754588937a9.tar.xz | |
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>
| -rw-r--r-- | fs/cifs/cifs_fs_sb.h | 1 | ||||
| -rw-r--r-- | fs/cifs/cifsfs.c | 2 | ||||
| -rw-r--r-- | fs/cifs/connect.c | 3 | ||||
| -rw-r--r-- | fs/cifs/inode.c | 4 |
4 files changed, 4 insertions, 6 deletions
diff --git a/fs/cifs/cifs_fs_sb.h b/fs/cifs/cifs_fs_sb.h index 3f4f1487f714..69d26313d350 100644 --- 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 3af22c09d8de..0932a3b225be 100644 --- 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 f6aa37aa3bf0..1c8b08c06ad7 100644 --- 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 bbdce32e978f..240d79e3aa14 100644 --- 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 */ |