[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>

3 files changed, 9 insertions, 11 deletions

diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
index 2c3d5ac4a3b6..80fcacc1acf9 100644
--- a/fs/lockd/svc.c
+++ b/fs/lockd/svc.c
@@ -141,6 +141,7 @@ lockd(struct svc_rqst *rqstp)
          */
         while ((nlmsvc_users || !signalled()) && nlmsvc_pid == current->pid) {
                 long timeout = MAX_SCHEDULE_TIMEOUT;
+                char buf[RPC_MAX_ADDRBUFLEN];
 
                 if (signalled()) {
                         flush_signals(current);
@@ -175,11 +176,10 @@ lockd(struct svc_rqst *rqstp)
                         break;
                 }
 
-                dprintk("lockd: request from %08x\n",
-                        (unsigned)ntohl(rqstp->rq_addr.sin_addr.s_addr));
+                dprintk("lockd: request from %s\n",
+                                svc_print_addr(rqstp, buf, sizeof(buf)));
 
                 svc_process(rqstp);
-
         }
 
         flush_signals(current);
diff --git a/fs/lockd/svc4proc.c b/fs/lockd/svc4proc.c
index f67146a8199a..9b591bc18341 100644
--- a/fs/lockd/svc4proc.c
+++ b/fs/lockd/svc4proc.c
@@ -426,10 +426,9 @@ nlm4svc_proc_sm_notify(struct svc_rqst *rqstp, struct nlm_reboot *argp,
         dprintk("lockd: SM_NOTIFY     called\n");
         if (saddr.sin_addr.s_addr != htonl(INADDR_LOOPBACK)
          || ntohs(saddr.sin_port) >= 1024) {
-                printk(KERN_WARNING
-                        "lockd: rejected NSM callback from %08x:%d\n",
-                        ntohl(rqstp->rq_addr.sin_addr.s_addr),
-                        ntohs(rqstp->rq_addr.sin_port));
+                char buf[RPC_MAX_ADDRBUFLEN];
+                printk(KERN_WARNING "lockd: rejected NSM callback from %s\n",
+                                svc_print_addr(rqstp, buf, sizeof(buf)));
                 return rpc_system_err;
         }
 
diff --git a/fs/lockd/svcproc.c b/fs/lockd/svcproc.c
index 3707c3a23e93..f590304d93bf 100644
--- a/fs/lockd/svcproc.c
+++ b/fs/lockd/svcproc.c
@@ -457,10 +457,9 @@ nlmsvc_proc_sm_notify(struct svc_rqst *rqstp, struct nlm_reboot *argp,
         dprintk("lockd: SM_NOTIFY     called\n");
         if (saddr.sin_addr.s_addr != htonl(INADDR_LOOPBACK)
          || ntohs(saddr.sin_port) >= 1024) {
-                printk(KERN_WARNING
-                        "lockd: rejected NSM callback from %08x:%d\n",
-                        ntohl(rqstp->rq_addr.sin_addr.s_addr),
-                        ntohs(rqstp->rq_addr.sin_port));
+                char buf[RPC_MAX_ADDRBUFLEN];
+                printk(KERN_WARNING "lockd: rejected NSM callback from %s\n",
+                                svc_print_addr(rqstp, buf, sizeof(buf)));
                 return rpc_system_err;
         }