From: Steve French <smfrench@gmail.com>
To: Ronnie Sahlberg <lsahlber@redhat.com>
Cc: linux-cifs <linux-cifs@vger.kernel.org>
Subject: Re: [PATCH 10/21] cifs: remove actimeo from cifs_sb
Date: Sat, 12 Dec 2020 13:44:55 -0600 [thread overview]
Message-ID: <CAH2r5murj9gJgS218vafXTh6mu8O2B+m7L7ert2bzY2x2xJa3A@mail.gmail.com> (raw)
In-Reply-To: <20201207233646.29823-10-lsahlber@redhat.com>
tentatively merged into cifs-2.6.gif for-next
On Mon, Dec 7, 2020 at 5:37 PM Ronnie Sahlberg <lsahlber@redhat.com> wrote:
>
> Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
> ---
> 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
next prev parent reply other threads:[~2020-12-12 19:45 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20201207233646.29823-1-lsahlber@redhat.com>
2020-12-07 23:36 ` [PATCH 02/21] cifs: rename dup_vol to smb3_fs_context_dup and move it into fs_context.c Ronnie Sahlberg
2020-12-07 23:36 ` [PATCH 03/21] cifs: move the enum for cifs parameters into fs_context.h Ronnie Sahlberg
2020-12-07 23:36 ` [PATCH 04/21] cifs: move cifs_parse_devname to fs_context.c Ronnie Sahlberg
2020-12-07 23:36 ` [PATCH 05/21] cifs: switch to new mount api Ronnie Sahlberg
2020-12-07 23:36 ` [PATCH 06/21] cifs: remove the devname argument to cifs_compose_mount_options Ronnie Sahlberg
2020-12-07 23:36 ` [PATCH 07/21] cifs: add an smb3_fs_context to cifs_sb Ronnie Sahlberg
2020-12-07 23:36 ` [PATCH 08/21] cifs: get rid of cifs_sb->mountdata Ronnie Sahlberg
2020-12-07 23:36 ` [PATCH 09/21] cifs: remove [gu]id/backup[gu]id/file_mode/dir_mode from cifs_sb Ronnie Sahlberg
2020-12-12 19:42 ` Steve French
2020-12-07 23:36 ` [PATCH 10/21] cifs: remove actimeo " Ronnie Sahlberg
2020-12-12 19:44 ` Steve French [this message]
2020-12-07 23:36 ` [PATCH 11/21] cifs: move cifs_cleanup_volume_info[_content] to fs_context.c Ronnie Sahlberg
2020-12-07 23:36 ` [PATCH 12/21] cifs: move [brw]size from cifs_sb to cifs_sb->ctx Ronnie Sahlberg
2020-12-07 23:36 ` [PATCH 13/21] cifs: add initial reconfigure support Ronnie Sahlberg
2020-12-07 23:36 ` [PATCH 14/21] cifs: we do not allow changing username/password/unc/... during remount Ronnie Sahlberg
2020-12-08 5:06 ` Steve French
2020-12-08 18:42 ` Pavel Shilovsky
2020-12-08 21:38 ` ronnie sahlberg
2020-12-07 23:36 ` [PATCH 15/21] cifs: simplify handling of cifs_sb/ctx->local_nls Ronnie Sahlberg
2020-12-07 23:36 ` [PATCH 16/21] cifs: don't create a temp nls in cifs_setup_ipc Ronnie Sahlberg
2020-12-07 23:36 ` [PATCH 17/21] cifs: uncomplicate printing the iocharset parameter Ronnie Sahlberg
2020-12-07 23:36 ` [PATCH 18/21] cifs: do not allow changing posix_paths during remount Ronnie Sahlberg
2020-12-07 23:36 ` [PATCH 19/21] cifs: remove ctx argument from cifs_setup_cifs_sb Ronnie Sahlberg
2020-12-07 23:36 ` [PATCH 20/21] cifs: move update of flags into a separate function Ronnie Sahlberg
2020-12-07 23:36 ` [PATCH 21/21] cifs: update mnt_cifs_flags during reconfigure Ronnie Sahlberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAH2r5murj9gJgS218vafXTh6mu8O2B+m7L7ert2bzY2x2xJa3A@mail.gmail.com \
--to=smfrench@gmail.com \
--cc=linux-cifs@vger.kernel.org \
--cc=lsahlber@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.