[PATCH] knfsd: Correctly handle error condition from lockd_up

If lockd_up fails - what should we expect?  Do we have to later call
lockd_down?

Well the nfs client thinks "no", the nfs server thinks "yes".  lockd thinks
"yes".

The only answer that really makes sense is "no" !!

So:
  Make lockd_up only increment  nlmsvc_users on success.
  Make nfsd handle errors from lockd_up properly.
  Make sure lockd_up(0) never fails when lockd is running
    so that the 'reclaimer' call to lockd_up doesn't need to
    be error checked.

Cc: "J. Bruce Fields" <bfields@fieldses.org>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 10 insertions, 6 deletions

diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index f1314c63e823..cdec3993e0d5 100644
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -221,18 +221,22 @@ static int nfsd_init_socks(int port)
         if (!list_empty(&nfsd_serv->sv_permsocks))
                 return 0;
 
-        error = svc_makesock(nfsd_serv, IPPROTO_UDP, port);
-        if (error < 0)
-                return error;
         error = lockd_up(IPPROTO_UDP);
+        if (error >= 0) {
+                error = svc_makesock(nfsd_serv, IPPROTO_UDP, port);
+                if (error < 0)
+                        lockd_down();
+        }
         if (error < 0)
                 return error;
 
 #ifdef CONFIG_NFSD_TCP
-        error = svc_makesock(nfsd_serv, IPPROTO_TCP, port);
-        if (error < 0)
-                return error;
         error = lockd_up(IPPROTO_TCP);
+        if (error >= 0) {
+                error = svc_makesock(nfsd_serv, IPPROTO_TCP, port);
+                if (error < 0)
+                        lockd_down();
+        }
         if (error < 0)
                 return error;
 #endif