NFSv4.1 remove xprt from xprt_switch if session trunking test fails

If we are doing a session trunking test and it fails for the transport,
then remove this transport from the xprt_switch group.

Signed-off-by: Olga Kornievskaia <kolga@netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 3f4e84e9646efebe5457c5bb2e5d6dc6c89d41f5..4850e29904e65252d0789b9196ad0ed9e2ae4962 100644 (file)
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -8922,6 +8922,9 @@ void nfs4_test_session_trunk(struct rpc_clnt *clnt, struct rpc_xprt *xprt,
 
        if (status == 0)
                rpc_clnt_xprt_switch_add_xprt(clnt, xprt);
+       else if (rpc_clnt_xprt_switch_has_addr(clnt,
+                               (struct sockaddr *)&xprt->addr))
+               rpc_clnt_xprt_switch_remove_xprt(clnt, xprt);
 
        rpc_put_task(task);
 }