]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
NFSv4.1: don't retry BIND_CONN_TO_SESSION on session error
authorOlga Kornievskaia <kolga@netapp.com>
Thu, 24 Mar 2022 14:38:42 +0000 (10:38 -0400)
committerStefan Bader <stefan.bader@canonical.com>
Fri, 20 May 2022 13:19:14 +0000 (15:19 +0200)
BugLink: https://bugs.launchpad.net/bugs/1971497
[ 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>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
fs/nfs/nfs4proc.c

index 31579b75cccc1b2be2ae0fa22f3e4cec2b4f710d..b44a7005062d44dea0b250adcbec29b394718eef 100644 (file)
@@ -7922,6 +7922,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) {