nfs: Fix truncated client owner id without proto type
authorKinglong Mee <kinglongmee@gmail.com>
Mon, 31 Aug 2015 02:53:33 +0000 (10:53 +0800)
committerTrond Myklebust <trond.myklebust@primarydata.com>
Tue, 1 Sep 2015 22:19:40 +0000 (15:19 -0700)
The length of "Linux NFSv4.0 " is 14, not 10.

Without this patch, I get a truncated client owner id as,
"Linux NFSv4.0 ::1/::1"

With this patch,
"Linux NFSv4.0 ::1/::1 tcp"

Fixes: a319268891 ("nfs: make nfs4_init_nonuniform_client_string use a dynamically allocated buffer")
Signed-off-by: Kinglong Mee <kinglongmee@gmail.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
fs/nfs/nfs4proc.c

index 51c7164abd1ac200e01b1f089510463dc65b07af..3f73539579e54671602575f188091a96b5a7fbba 100644 (file)
@@ -5020,7 +5020,7 @@ nfs4_init_nonuniform_client_string(struct nfs_client *clp)
                return 0;
 retry:
        rcu_read_lock();
-       len = 10 + strlen(clp->cl_ipaddr) + 1 +
+       len = 14 + strlen(clp->cl_ipaddr) + 1 +
                strlen(rpc_peeraddr2str(clp->cl_rpcclient, RPC_DISPLAY_ADDR)) +
                1 +
                strlen(rpc_peeraddr2str(clp->cl_rpcclient, RPC_DISPLAY_PROTO)) +