Skip to contentSkip to conversation

NFSv4: try lease recovery on NFS4ERR_EXPIRED

PATCH In review Robert Milkowski 2 participants 2 messages Jan 28, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 NFSv4: try lease recovery on NFS4ERR_EXPIRED

From: Robert Milkowski <[email protected]>

Currently, if an nfs server returns NFS4ERR_EXPIRED to open(), we return EIO to applications without even trying to recover.

Fixes 272289a3df72 ("NFSv4: nfs4_do_handle_exception() handle revoke/expiry of a single stateid")
---
 fs/nfs/nfs4proc.c | 5 +++++
 1 file changed, 5 insertions(+)
fs/nfs/nfs4proc.c +5 -0
index 76d3716..b7c4044 100644
@@ -3187,6 +3187,11 @@ static struct nfs4_state *nfs4_do_open(struct inode *dir,
 			exception.retry = 1;
 			continue;
 		}
+		if (status == -NFS4ERR_EXPIRED) {
+			nfs4_schedule_lease_recovery(server->nfs_client);
+			exception.retry = 1;
+			continue;
+		}
 		if (status == -EAGAIN) {
 			/* We must have found a delegation */
 			exception.retry = 1;
Signature · 1 line
1.8.3.1
Reviewed-by on v3 1/1
#1 lore raw
Quoted 28 lines · Robert Milkowski

From: Robert Milkowski <[email protected]>

Currently, if an nfs server returns NFS4ERR_EXPIRED to open(), we return EIO to applications without even trying to recover.

Fixes 272289a3df72 ("NFSv4: nfs4_do_handle_exception() handle

revoke/expiry of a single stateid")

---
 fs/nfs/nfs4proc.c | 5 +++++
 1 file changed, 5 insertions(+)
fs/nfs/nfs4proc.c +5 -0
index 76d3716..b7c4044 100644
@@ -3187,6 +3187,11 @@ static struct nfs4_state *nfs4_do_open(struct
 inode *dir,
 			exception.retry = 1;
 			continue;
 		}
+		if (status == -NFS4ERR_EXPIRED) {
+			nfs4_schedule_lease_recovery(server-
 >nfs_client);
+			exception.retry = 1;
+			continue;
+		}
 		if (status == -EAGAIN) {

fs/nfs/nfs4proc.c static struct nfs4_state *nfs4_do_open(struct inode *dir, · line 3197

Quoted 2 lines
fs/nfs/nfs4proc.c +0 -0
 			/* We must have found a delegation */
 			exception.retry = 1;

Looks good.

Signature · 3 lines
Trond Myklebust
Linux NFS client maintainer, Hammerspace
[email protected]