tentatively merged into cifs-2.6.gif for-next
On Mon, Dec 7, 2020 at 5:37 PM Ronnie Sahlberg <lsahlber@xxxxxxxxxx> wrote:
>
> Signed-off-by: Ronnie Sahlberg <lsahlber@xxxxxxxxxx>
> ---
> fs/cifs/cifs_fs_sb.h | 1 -
> fs/cifs/cifsfs.c | 2 +-
> fs/cifs/connect.c | 3 +--
> 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 4ea8c3c3bce1..e432de7c6ca1 100644
> --- a/fs/cifs/cifsfs.c
> +++ b/fs/cifs/cifsfs.c
> @@ -629,7 +629,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 96c5b66d4b44..47e2fe8c19a2 100644
> --- a/fs/cifs/connect.c
> +++ b/fs/cifs/connect.c
> @@ -2236,7 +2236,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;
> @@ -2682,7 +2682,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 e8a7110db2a6..fb07e0828958 100644
> --- a/fs/cifs/inode.c
> +++ b/fs/cifs/inode.c
> @@ -2165,11 +2165,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 */
> --
> 2.13.6
>
--
Thanks,
Steve
