[PATCH] knfsd: SUNRPC: Add a function to format the address in an svc_rqst for printing

There are loads of places where the RPC server assumes that the rq_addr fields
contains an IPv4 address.  Top among these are error and debugging messages
that display the server's IP address.

Let's refactor the address printing into a separate function that's smart
enough to figure out the difference between IPv4 and IPv6 addresses.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Cc: Aurelien Charbon <aurelien.charbon@ext.bull.net>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2 files changed, 8 insertions, 6 deletions

diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c
index c59d6fbb7a6b..a0b4282cb284 100644
--- a/fs/nfsd/nfsfh.c
+++ b/fs/nfsd/nfsfh.c
@@ -20,6 +20,7 @@
 #include <linux/mount.h>
 #include <asm/pgtable.h>
 
+#include <linux/sunrpc/clnt.h>
 #include <linux/sunrpc/svc.h>
 #include <linux/nfsd/nfsd.h>
 
@@ -180,10 +181,10 @@ fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, int access)
                 /* Check if the request originated from a secure port. */
                 error = nfserr_perm;
                 if (!rqstp->rq_secure && EX_SECURE(exp)) {
+                        char buf[RPC_MAX_ADDRBUFLEN];
                         printk(KERN_WARNING
-                               "nfsd: request from insecure port (%u.%u.%u.%u:%d)!\n",
-                               NIPQUAD(rqstp->rq_addr.sin_addr.s_addr),
-                               ntohs(rqstp->rq_addr.sin_port));
+                               "nfsd: request from insecure port %s!\n",
+                               svc_print_addr(rqstp, buf, sizeof(buf)));
                         goto out;
                 }
 
diff --git a/fs/nfsd/nfsproc.c b/fs/nfsd/nfsproc.c
index ec983b777680..5cc2eec981b8 100644
--- a/fs/nfsd/nfsproc.c
+++ b/fs/nfsd/nfsproc.c
@@ -19,6 +19,7 @@
 #include <linux/unistd.h>
 #include <linux/slab.h>
 
+#include <linux/sunrpc/clnt.h>
 #include <linux/sunrpc/svc.h>
 #include <linux/nfsd/nfsd.h>
 #include <linux/nfsd/cache.h>
@@ -147,10 +148,10 @@ nfsd_proc_read(struct svc_rqst *rqstp, struct nfsd_readargs *argp,
          */
 
         if (NFSSVC_MAXBLKSIZE_V2 < argp->count) {
+                char buf[RPC_MAX_ADDRBUFLEN];
                 printk(KERN_NOTICE
-                        "oversized read request from %u.%u.%u.%u:%d (%d bytes)\n",
-                                NIPQUAD(rqstp->rq_addr.sin_addr.s_addr),
-                                ntohs(rqstp->rq_addr.sin_port),
+                        "oversized read request from %s (%d bytes)\n",
+                                svc_print_addr(rqstp, buf, sizeof(buf)),
                                 argp->count);
                 argp->count = NFSSVC_MAXBLKSIZE_V2;
         }