NLM: Remove "proto" argument from lockd_up()

Clean up: Now that lockd_up() starts listeners for both transports, the
"proto" argument is no longer needed.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Cc: Neil Brown <neilb@suse.de>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>

2 files changed, 9 insertions, 15 deletions

diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index c53e65f8f3a..862dff5247f 100644
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -614,10 +614,9 @@ static ssize_t __write_ports(struct file *file, char *buf, size_t size)
                         return -EINVAL;
                 err = nfsd_create_serv();
                 if (!err) {
-                        int proto = 0;
-                        err = svc_addsock(nfsd_serv, fd, buf, &proto);
+                        err = svc_addsock(nfsd_serv, fd, buf, NULL);
                         if (err >= 0) {
-                                err = lockd_up(proto);
+                                err = lockd_up();
                                 if (err < 0)
                                         svc_sock_names(buf+strlen(buf)+1, nfsd_serv, buf);
                         }
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index 7f3d76a7839..59eeb46f82c 100644
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -244,25 +244,20 @@ static int nfsd_init_socks(int port)
         if (!list_empty(&nfsd_serv->sv_permsocks))
                 return 0;
 
-        error = lockd_up(IPPROTO_UDP);
-        if (error >= 0) {
-                error = svc_create_xprt(nfsd_serv, "udp", port,
+        error = svc_create_xprt(nfsd_serv, "udp", port,
                                         SVC_SOCK_DEFAULTS);
-                if (error < 0)
-                        lockd_down();
-        }
         if (error < 0)
                 return error;
 
-        error = lockd_up(IPPROTO_TCP);
-        if (error >= 0) {
-                error = svc_create_xprt(nfsd_serv, "tcp", port,
+        error = svc_create_xprt(nfsd_serv, "tcp", port,
                                         SVC_SOCK_DEFAULTS);
-                if (error < 0)
-                        lockd_down();
-        }
         if (error < 0)
                 return error;
+
+        error = lockd_up();
+        if (error < 0)
+                return error;
+
         return 0;
 }