linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] NFSv4: nfs4_do_fsinfo() should not do implicit lease renewals
@ 2019-12-16 17:38 Robert Milkowski
  2019-12-16 18:24 ` Trond Myklebust
  2019-12-16 18:36 ` Robert Milkowski
  0 siblings, 2 replies; 9+ messages in thread
From: Robert Milkowski @ 2019-12-16 17:38 UTC (permalink / raw)
  To: linux-nfs
  Cc: 'Trond Myklebust', 'Anna Schumaker',
	linux-kernel, linux-nfs

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 NFS server which will then
return NFS4ERR_EXPIRED or NFS4ERR_STALE_CLIENTID.

Signed-off-by: Robert Milkowski <rmilkowski@gmail.com>
---
 fs/nfs/nfs4proc.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 76d3716..aad65dd 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -5019,16 +5019,19 @@ static int nfs4_do_fsinfo(struct nfs_server *server,
struct nfs_fh *fhandle, str
 	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) {
+			/* no implicit lease renewal allowed here */
+			if (server->nfs_client->cl_last_renewal != 0)
+				last_renewal =
server->nfs_client->cl_last_renewal;
 			nfs4_set_lease_period(server->nfs_client,
 					fsinfo->lease_time * HZ,
-					now);
+					last_renewal);
 			break;
 		}
 		err = nfs4_handle_exception(server, err, &exception);
-- 
1.8.3.1



^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2019-12-18 14:48 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-16 17:38 [PATCH] NFSv4: nfs4_do_fsinfo() should not do implicit lease renewals Robert Milkowski
2019-12-16 18:24 ` Trond Myklebust
2019-12-16 18:43   ` Robert Milkowski
2019-12-16 18:58     ` Trond Myklebust
2019-12-17 18:12       ` Robert Milkowski
2019-12-18 14:48         ` Robert Milkowski
2019-12-16 18:58     ` Chuck Lever
2019-12-16 18:36 ` Robert Milkowski
2019-12-16 18:41   ` Robert Milkowski

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).