From: "Robert Milkowski" <rmilkowski@gmail.com>
To: <linux-nfs@vger.kernel.org>
Cc: "'Trond Myklebust'" <trond.myklebust@hammerspace.com>,
"'Anna Schumaker'" <anna.schumaker@netapp.com>,
<linux-kernel@vger.kernel.org>
Subject: [PATCH v2] NFSv4.0: nfs4_do_fsinfo() should not do implicit lease
Date: Tue, 24 Dec 2019 14:36:31 -0000 [thread overview]
Message-ID: <001901d5ba67$8954ede0$9bfec9a0$@gmail.com> (raw)
From: Robert Milkowski <rmilkowski@gmail.com>
Currently, each time nfs4_do_fsinfo() is called it will do an implicit
NFS4 lease renewal, which is not compliant with the NFS4 specification.
This can result in a lease being expired by an NFS server.
Signed-off-by: Robert Milkowski <rmilkowski@gmail.com>
---
fs/nfs/nfs4proc.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 76d3716..b6cad9a 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -5016,19 +5016,23 @@ static int _nfs4_do_fsinfo(struct nfs_server *server, struct nfs_fh *fhandle,
static int nfs4_do_fsinfo(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fsinfo *fsinfo)
{
+ struct nfs_client *clp = server->nfs_client;
struct nfs4_exception exception = {
.interruptible = true,
};
- unsigned long now = jiffies;
+ unsigned long last_renewal = jiffies;
int err;
do {
err = _nfs4_do_fsinfo(server, fhandle, fsinfo);
trace_nfs4_fsinfo(server, fhandle, fsinfo->fattr, err);
if (err == 0) {
- nfs4_set_lease_period(server->nfs_client,
+ /* no implicit lease renewal allowed here for v4.0 */
+ if (clp->cl_minorversion == 0 && clp->cl_last_renewal != 0)
+ last_renewal = clp->cl_last_renewal;
+ nfs4_set_lease_period(clp,
fsinfo->lease_time * HZ,
- now);
+ last_renewal);
break;
}
err = nfs4_handle_exception(server, err, &exception);
--
1.8.3.1
next reply other threads:[~2019-12-24 14:36 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-24 14:36 Robert Milkowski [this message]
2019-12-24 18:32 ` [PATCH v2] NFSv4.0: nfs4_do_fsinfo() should not do implicit lease Chuck Lever
2019-12-27 19:07 ` Robert Milkowski
2019-12-27 20:24 ` Chuck Lever
2019-12-30 13:41 ` Robert Milkowski
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='001901d5ba67$8954ede0$9bfec9a0$@gmail.com' \
--to=rmilkowski@gmail.com \
--cc=anna.schumaker@netapp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=trond.myklebust@hammerspace.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).