1 files changed, 19 insertions, 13 deletions

diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
index 8ca18085e68d..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);
@@ -223,23 +223,29 @@ static int find_socket(struct svc_serv *serv, int proto)
         return found;
 }
 
+/*
+ * Make any sockets that are needed but not present.
+ * If nlm_udpport or nlm_tcpport were set as module
+ * options, make those sockets unconditionally
+ */
 static int make_socks(struct svc_serv *serv, int proto)
 {
-        /* Make any sockets that are needed but not present.
-         * If nlm_udpport or nlm_tcpport were set as module
-         * options, make those sockets unconditionally
-         */
-        static int              warned;
+        static int warned;
         int err = 0;
+
         if (proto == IPPROTO_UDP || nlm_udpport)
                 if (!find_socket(serv, IPPROTO_UDP))
-                        err = svc_makesock(serv, IPPROTO_UDP, nlm_udpport);
-        if (err == 0 && (proto == IPPROTO_TCP || nlm_tcpport))
+                        err = svc_makesock(serv, IPPROTO_UDP, nlm_udpport,
+                                                SVC_SOCK_DEFAULTS);
+        if (err >= 0 && (proto == IPPROTO_TCP || nlm_tcpport))
                 if (!find_socket(serv, IPPROTO_TCP))
-                        err= svc_makesock(serv, IPPROTO_TCP, nlm_tcpport);
-        if (!err)
+                        err = svc_makesock(serv, IPPROTO_TCP, nlm_tcpport,
+                                                SVC_SOCK_DEFAULTS);
+
+        if (err >= 0) {
                 warned = 0;
-        else if (warned++ == 0)
+                err = 0;
+        } else if (warned++ == 0)
                 printk(KERN_WARNING
                        "lockd_up: makesock failed, error=%d\n", err);
         return err;