[v5,08/10] NFSv4: Retry NFS4ERR_OLD_STATEID errors in layoutreturn
diff mbox

Message ID 20171103113539.5551-9-trond.myklebust@primarydata.com
State New
Headers show

Commit Message

Trond Myklebust Nov. 3, 2017, 11:35 a.m. UTC
If our layoutreturn returns an NFS4ERR_OLD_STATEID, then try to
update the stateid and retry.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
---
 fs/nfs/nfs4proc.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

Patch
diff mbox

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 1bb0e405aa57..79306a903453 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -8766,8 +8766,15 @@  static void nfs4_layoutreturn_done(struct rpc_task *task, void *calldata)
 
 	server = NFS_SERVER(lrp->args.inode);
 	switch (task->tk_status) {
+	case -NFS4ERR_OLD_STATEID:
+		if (nfs4_refresh_layout_stateid(&lrp->args.stateid,
+					lrp->args.inode)) {
+			goto out_restart;
+		}
+		/* Fallthrough */
 	default:
 		task->tk_status = 0;
+		/* Fallthrough */
 	case 0:
 		break;
 	case -NFS4ERR_DELAY:
@@ -8778,6 +8785,10 @@  static void nfs4_layoutreturn_done(struct rpc_task *task, void *calldata)
 		return;
 	}
 	dprintk("<-- %s\n", __func__);
+	return;
+out_restart:
+	nfs4_sequence_free_slot(&lrp->res.seq_res);
+	rpc_restart_call_prepare(task);
 }
 
 static void nfs4_layoutreturn_release(void *calldata)