[PATCH] knfsd: Fixed handling of lockd fail when adding nfsd socket

Arrgg..  We cannot 'lockd_up' before 'svc_addsock' as we don't know the
protocol yet....  So switch it around again and save the name of the created
sockets so that it can be closed if lock_up fails.

Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index f85472dda46312df02ccff615d1019cd2bcdc6a0..6c2ddfed2cfc40b397fed9737712cc14f01872d1 100644 (file)
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -523,11 +523,11 @@ static ssize_t write_ports(struct file *file, char *buf, size_t size)
                err = nfsd_create_serv();
                if (!err) {
                        int proto = 0;
-                       err = lockd_up(proto);
-                       if (!err) {
-                               err = svc_addsock(nfsd_serv, fd, buf, &proto);
-                               if (err)
-                                       lockd_down();
+                       err = svc_addsock(nfsd_serv, fd, buf, &proto);
+                       if (err >= 0) {
+                               err = lockd_up(proto);
+                               if (err < 0)
+                                       svc_sock_names(buf+strlen(buf)+1, nfsd_serv, buf);
                        }
                        /* Decrease the count, but don't shutdown the
                         * the service
@@ -536,7 +536,7 @@ static ssize_t write_ports(struct file *file, char *buf, size_t size)
                        nfsd_serv->sv_nrthreads--;
                        unlock_kernel();
                }
-               return err;
+               return err < 0 ? err : 0;
        }
        if (buf[0] == '-') {
                char *toclose = kstrdup(buf+1, GFP_KERNEL);

diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index 4e0813b12ccf407bee77511ba0d91de7fffccd76..4de8626e4f547a7c8d977a886eaed4ad15fd2eb1 100644 (file)
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -492,6 +492,9 @@ svc_sock_names(char *buf, struct svc_serv *serv, char *toclose)
        }
        spin_unlock(&serv->sv_lock);
        if (closesk)
+               /* Should unregister with portmap, but you cannot
+                * unregister just one protocol...
+                */
                svc_delete_socket(closesk);
        else if (toclose)
                return -ENOENT;