diff options
author | Bryan Schumaker <bjschuma@netapp.com> | 2012-12-07 16:17:28 -0500 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2012-12-10 18:24:21 -0500 |
commit | 0a5c33e23c4d781ecc815002c54f1f91012c703d (patch) | |
tree | cbc351dba8ab9d85fb53f76b83874861bc32a31e /fs/nfsd | |
parent | 88c47666171989ed4c5b1a5687df09511e8c5e35 (diff) |
NFSD: Pass correct buffer size to rpc_ntop
I honestly have no idea where I got 129 from, but it's a much bigger
value than the actual buffer size (INET6_ADDRSTRLEN).
Signed-off-by: Bryan Schumaker <bjschuma@netapp.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
-rw-r--r-- | fs/nfsd/fault_inject.c | 2 | ||||
-rw-r--r-- | fs/nfsd/nfs4state.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfsd/fault_inject.c b/fs/nfsd/fault_inject.c index 96ffdf55dcec..7a7b079fbdb1 100644 --- a/fs/nfsd/fault_inject.c +++ b/fs/nfsd/fault_inject.c | |||
@@ -79,7 +79,7 @@ static void nfsd_inject_set_client(struct nfsd_fault_inject_op *op, | |||
79 | clp = nfsd_find_client(addr, addr_size); | 79 | clp = nfsd_find_client(addr, addr_size); |
80 | if (clp) { | 80 | if (clp) { |
81 | count = op->forget(clp, 0); | 81 | count = op->forget(clp, 0); |
82 | rpc_ntop((struct sockaddr *)&clp->cl_addr, buf, 129); | 82 | rpc_ntop((struct sockaddr *)&clp->cl_addr, buf, sizeof(buf)); |
83 | printk(KERN_INFO "NFSD [%s]: Client %s had %llu state object(s)\n", op->file, buf, count); | 83 | printk(KERN_INFO "NFSD [%s]: Client %s had %llu state object(s)\n", op->file, buf, count); |
84 | } | 84 | } |
85 | nfs4_unlock_state(); | 85 | nfs4_unlock_state(); |
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 3d27f08e2297..8e2555112966 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c | |||
@@ -4623,7 +4623,7 @@ u64 nfsd_forget_client(struct nfs4_client *clp, u64 max) | |||
4623 | u64 nfsd_print_client(struct nfs4_client *clp, u64 num) | 4623 | u64 nfsd_print_client(struct nfs4_client *clp, u64 num) |
4624 | { | 4624 | { |
4625 | char buf[INET6_ADDRSTRLEN]; | 4625 | char buf[INET6_ADDRSTRLEN]; |
4626 | rpc_ntop((struct sockaddr *)&clp->cl_addr, buf, 129); | 4626 | rpc_ntop((struct sockaddr *)&clp->cl_addr, buf, sizeof(buf)); |
4627 | printk(KERN_INFO "NFS Client: %s\n", buf); | 4627 | printk(KERN_INFO "NFS Client: %s\n", buf); |
4628 | return 1; | 4628 | return 1; |
4629 | } | 4629 | } |
@@ -4632,7 +4632,7 @@ static void nfsd_print_count(struct nfs4_client *clp, unsigned int count, | |||
4632 | const char *type) | 4632 | const char *type) |
4633 | { | 4633 | { |
4634 | char buf[INET6_ADDRSTRLEN]; | 4634 | char buf[INET6_ADDRSTRLEN]; |
4635 | rpc_ntop((struct sockaddr *)&clp->cl_addr, buf, 129); | 4635 | rpc_ntop((struct sockaddr *)&clp->cl_addr, buf, sizeof(buf)); |
4636 | printk(KERN_INFO "NFS Client: %s has %u %s\n", buf, count, type); | 4636 | printk(KERN_INFO "NFS Client: %s has %u %s\n", buf, count, type); |
4637 | } | 4637 | } |
4638 | 4638 | ||