From: Olga Kornievskaia <kolga@netapp.com>
Date: Thu, 24 Mar 2022 14:38:42 +0000 (-0400)
Subject: NFSv4.1: don't retry BIND_CONN_TO_SESSION on session error
X-Git-Tag: v5.10.110~166
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a9fa7d48a1cdcb46f0dcf75c2d63fcb138e194f2;p=users%2Fdwmw2%2Flinux.git

NFSv4.1: don't retry BIND_CONN_TO_SESSION on session error

[ Upstream commit 1d15d121cc2ad4d016a7dc1493132a9696f91fc5 ]

There is no reason to retry the operation if a session error had
occurred in such case result structure isn't filled out.

Fixes: dff58530c4ca ("NFSv4.1: fix handling of backchannel binding in BIND_CONN_TO_SESSION")
Signed-off-by: Olga Kornievskaia <kolga@netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index d222a980164b7..77199d3560429 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -8205,6 +8205,7 @@ nfs4_bind_one_conn_to_session_done(struct rpc_task *task, void *calldata)
 	case -NFS4ERR_DEADSESSION:
 		nfs4_schedule_session_recovery(clp->cl_session,
 				task->tk_status);
+		return;
 	}
 	if (args->dir == NFS4_CDFC4_FORE_OR_BOTH &&
 			res->dir != NFS4_CDFS4_BOTH) {