NFSv4.1 add network transport when session trunking is detected

After trunking is discovered in nfs4_discover_server_trunking(),
add the transport to the old client structure if the allowed limit
of transports has not been reached.

An example: there exists a multi-homed server and client mounts
one server address and some volume and then doest another mount to
a different address of the same server and perhaps a different
volume. Previously, the client checks that this is a session
trunkable servers (same server), and removes the newly created
client structure along with its transport. Now, the client
adds the connection from the 2nd mount into the xprt switch of
the existing client (it leads to having 2 available connections).

Signed-off-by: Olga Kornievskaia <kolga@netapp.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c
index 270caa1..af57332 100644 (file)
--- a/fs/nfs/nfs4client.c
+++ b/fs/nfs/nfs4client.c
@@ -402,6 +402,33 @@ static int nfs4_init_client_minor_version(struct nfs_client *clp)
        return nfs4_init_callback(clp);
 }
 
+static void nfs4_add_trunk(struct nfs_client *clp, struct nfs_client *old)
+{
+       struct sockaddr_storage clp_addr, old_addr;
+       struct sockaddr *clp_sap = (struct sockaddr *)&clp_addr;
+       struct sockaddr *old_sap = (struct sockaddr *)&old_addr;
+       size_t clp_salen;
+       struct xprt_create xprt_args = {
+               .ident = old->cl_proto,
+               .net = old->cl_net,
+               .servername = old->cl_hostname,
+       };
+
+       if (clp->cl_proto != old->cl_proto)
+               return;
+       clp_salen = rpc_peeraddr(clp->cl_rpcclient, clp_sap, sizeof(clp_addr));
+       rpc_peeraddr(old->cl_rpcclient, old_sap, sizeof(old_addr));
+
+       if (clp_addr.ss_family != old_addr.ss_family)
+               return;
+
+       xprt_args.dstaddr = clp_sap;
+       xprt_args.addrlen = clp_salen;
+
+       rpc_clnt_add_xprt(old->cl_rpcclient, &xprt_args,
+                         rpc_clnt_test_and_add_xprt, NULL);
+}
+
 /**
  * nfs4_init_client - Initialise an NFS4 client record
  *
@@ -436,6 +463,8 @@ struct nfs_client *nfs4_init_client(struct nfs_client *clp,
                 * won't try to use it.
                 */
                nfs_mark_client_ready(clp, -EPERM);
+               if (old->cl_mvops->session_trunk)
+                       nfs4_add_trunk(clp, old);
        }
        clear_bit(NFS_CS_TSM_POSSIBLE, &clp->cl_flags);
        nfs_put_client(clp);