summaryrefslogtreecommitdiff
path: root/fs/cifs/connect.c
diff options
context:
space:
mode:
authorRonnie Sahlberg <lsahlber@redhat.com>2020-11-10 12:34:48 +1000
committerSteve French <stfrench@microsoft.com>2020-12-14 09:16:23 -0600
commitaf1e40d9ac8417839d955ca1ac42f754588937a9 (patch)
treeabf76b4093c696a79e8943eb7c9bf806f3529981 /fs/cifs/connect.c
parent8401e93678933a140cebfa2e7122c1a6b687c355 (diff)
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>
Diffstat (limited to 'fs/cifs/connect.c')
-rw-r--r--fs/cifs/connect.c3
1 files changed, 1 insertions, 2 deletions
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)