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>

diff --git a/fs/nfsd/fault_inject.c b/fs/nfsd/fault_inject.c
index 96ffdf5..7a7b079 100644 (file)
--- 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,
        clp = nfsd_find_client(addr, addr_size);
        if (clp) {
                count = op->forget(clp, 0);
-               rpc_ntop((struct sockaddr *)&clp->cl_addr, buf, 129);
+               rpc_ntop((struct sockaddr *)&clp->cl_addr, buf, sizeof(buf));
                printk(KERN_INFO "NFSD [%s]: Client %s had %llu state object(s)\n", op->file, buf, count);
        }
        nfs4_unlock_state();

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 3d27f08..8e25551 100644 (file)
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -4623,7 +4623,7 @@ u64 nfsd_forget_client(struct nfs4_client *clp, u64 max)
 u64 nfsd_print_client(struct nfs4_client *clp, u64 num)
 {
        char buf[INET6_ADDRSTRLEN];
-       rpc_ntop((struct sockaddr *)&clp->cl_addr, buf, 129);
+       rpc_ntop((struct sockaddr *)&clp->cl_addr, buf, sizeof(buf));
        printk(KERN_INFO "NFS Client: %s\n", buf);
        return 1;
 }
@@ -4632,7 +4632,7 @@ static void nfsd_print_count(struct nfs4_client *clp, unsigned int count,
                             const char *type)
 {
        char buf[INET6_ADDRSTRLEN];
-       rpc_ntop((struct sockaddr *)&clp->cl_addr, buf, 129);
+       rpc_ntop((struct sockaddr *)&clp->cl_addr, buf, sizeof(buf));
        printk(KERN_INFO "NFS Client: %s has %u %s\n", buf, count, type);
 }