diff options
| author | Kinglong Mee <kinglongmee@gmail.com> | 2015-08-31 10:53:33 +0800 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-09-01 15:19:40 -0700 |
| commit | 4a70316caef7d158445e672e146eb9f1b8c1aeee (patch) | |
| tree | de26fffc656a0874cc0a04724aa76e357377157e | |
| parent | 889d94d49a3cbcbc8c8d07208549fa614d33da76 (diff) | |
| download | op-kernel-dev-4a70316caef7d158445e672e146eb9f1b8c1aeee.zip op-kernel-dev-4a70316caef7d158445e672e146eb9f1b8c1aeee.tar.gz | |
nfs: Fix truncated client owner id without proto type
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>
| -rw-r--r-- | fs/nfs/nfs4proc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 51c7164..3f73539 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -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)) + |
