Merge git://git.linux-nfs.org/pub/linux/nfs-2.6

* git://git.linux-nfs.org/pub/linux/nfs-2.6: (103 commits)
  SUNRPC,RPCSEC_GSS: spkm3--fix config dependencies
  SUNRPC,RPCSEC_GSS: spkm3: import contexts using NID_cast5_cbc
  LOCKD: Make nlmsvc_traverse_shares return void
  LOCKD: nlmsvc_traverse_blocks return is unused
  SUNRPC,RPCSEC_GSS: fix krb5 sequence numbers.
  NFSv4: Dont list system.nfs4_acl for filesystems that don't support it.
  SUNRPC,RPCSEC_GSS: remove unnecessary kmalloc of a checksum
  SUNRPC: Ensure rpc_call_async() always calls tk_ops->rpc_release()
  SUNRPC: Fix memory barriers for req->rq_received
  NFS: Fix a race in nfs_sync_inode()
  NFS: Clean up nfs_flush_list()
  NFS: Fix a race with PG_private and nfs_release_page()
  NFSv4: Ensure the callback daemon flushes signals
  SUNRPC: Fix a 'Busy inodes' error in rpc_pipefs
  NFS, NLM: Allow blocking locks to respect signals
  NFS: Make nfs_fhget() return appropriate error values
  NFSv4: Fix an oops in nfs4_fill_super
  lockd: blocks should hold a reference to the nlm_file
  NFSv4: SETCLIENTID_CONFIRM should handle NFS4ERR_DELAY/NFS4ERR_RESOURCE
  NFSv4: Send the delegation stateid for SETATTR calls
  ...

1 files changed, 14 insertions, 6 deletions

diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c
index fcd97406a778..99d2cfbce863 100644
--- a/fs/nfs/callback.c
+++ b/fs/nfs/callback.c
@@ -55,7 +55,12 @@ static void nfs_callback_svc(struct svc_rqst *rqstp)
 
         complete(&nfs_callback_info.started);
 
-        while (nfs_callback_info.users != 0 || !signalled()) {
+        for(;;) {
+                if (signalled()) {
+                        if (nfs_callback_info.users == 0)
+                                break;
+                        flush_signals(current);
+                }
                 /*
                  * Listen for a request on the socket
                  */
@@ -73,6 +78,7 @@ static void nfs_callback_svc(struct svc_rqst *rqstp)
                 svc_process(serv, rqstp);
         }
 
+        svc_exit_thread(rqstp);
         nfs_callback_info.pid = 0;
         complete(&nfs_callback_info.stopped);
         unlock_kernel();
@@ -134,11 +140,13 @@ int nfs_callback_down(void)
 
         lock_kernel();
         down(&nfs_callback_sema);
-        if (--nfs_callback_info.users || nfs_callback_info.pid == 0)
-                goto out;
-        kill_proc(nfs_callback_info.pid, SIGKILL, 1);
-        wait_for_completion(&nfs_callback_info.stopped);
-out:
+        nfs_callback_info.users--;
+        do {
+                if (nfs_callback_info.users != 0 || nfs_callback_info.pid == 0)
+                        break;
+                if (kill_proc(nfs_callback_info.pid, SIGKILL, 1) < 0)
+                        break;
+        } while (wait_for_completion_timeout(&nfs_callback_info.stopped, 5*HZ) == 0);
         up(&nfs_callback_sema);
         unlock_kernel();
         return ret;