NFSv4.0: Remove transport protocol name from non-UCS client ID

Commit 69dd716c5ffd ("NFSv4: Add socket proto argument to
setclientid") (2007) added the transport protocol name to the client
ID string, but the patch description doesn't explain why this was
necessary.

At that time, the only transport protocol name that would have been
used is "tcp" (for both IPv4 and IPv6), resulting in no additional
distinctiveness of the client ID string.

Since there is one client instance, the server should recognize it's
state whether the client is connecting via TCP or RDMA. Same client,
same lease.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index fda45ff7a6530d35c7af210ef0e51d2355dacea9..e39f59b5e6d2738990baf7339316f728c3141853 100644 (file)
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -5622,8 +5622,6 @@ nfs4_init_nonuniform_client_string(struct nfs_client *clp)
                strlen(clp->cl_rpcclient->cl_nodename) +
                1 +
                strlen(rpc_peeraddr2str(clp->cl_rpcclient, RPC_DISPLAY_ADDR)) +
-               1 +
-               strlen(rpc_peeraddr2str(clp->cl_rpcclient, RPC_DISPLAY_PROTO)) +
                1;
        rcu_read_unlock();
        if (nfs4_client_id_uniquifier[0] != '\0')
@@ -5642,20 +5640,16 @@ nfs4_init_nonuniform_client_string(struct nfs_client *clp)
 
        rcu_read_lock();
        if (nfs4_client_id_uniquifier[0] != '\0')
-               scnprintf(str, len, "Linux NFSv4.0 %s/%s/%s %s",
+               scnprintf(str, len, "Linux NFSv4.0 %s/%s/%s",
                          clp->cl_rpcclient->cl_nodename,
                          nfs4_client_id_uniquifier,
                          rpc_peeraddr2str(clp->cl_rpcclient,
-                                          RPC_DISPLAY_ADDR),
-                         rpc_peeraddr2str(clp->cl_rpcclient,
-                                          RPC_DISPLAY_PROTO));
+                                          RPC_DISPLAY_ADDR));
        else
-               scnprintf(str, len, "Linux NFSv4.0 %s/%s %s",
+               scnprintf(str, len, "Linux NFSv4.0 %s/%s",
                          clp->cl_rpcclient->cl_nodename,
                          rpc_peeraddr2str(clp->cl_rpcclient,
-                                          RPC_DISPLAY_ADDR),
-                         rpc_peeraddr2str(clp->cl_rpcclient,
-                                          RPC_DISPLAY_PROTO));
+                                          RPC_DISPLAY_ADDR));
        rcu_read_unlock();
 
        clp->cl_owner_id = str;