[SUNRPC]: Use completions instead of sleep_on for rpciod.

The rpciod shutdown code gives ugly sleep_on without BKL warnings in
-mm.  And it looks indeed somewhat racy.

The easy fix would be to simply use a completion as in the patch below,
but that removes all the signal fuzzing semantics the current code has.
I don't really understand why we want to cancel the operation by
signals, but I think it'd be better to leave that to people familar with
the code anyway..

diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
index 79ebf10e03d9694d6d2632da23832389df3dc34c..f40cf74c7f2882bd85837735331254507b788e6f 100644 (file)
--- a/net/sunrpc/sched.c
+++ b/net/sunrpc/sched.c
@@ -71,7 +71,7 @@ static LIST_HEAD(all_tasks);
  * rpciod-related stuff
  */
 static DECLARE_WAIT_QUEUE_HEAD(rpciod_idle);
-static DECLARE_WAIT_QUEUE_HEAD(rpciod_killer);
+static DECLARE_COMPLETION(rpciod_killer);
 static DECLARE_MUTEX(rpciod_sema);
 static unsigned int            rpciod_users;
 static pid_t                   rpciod_pid;
@@ -950,7 +950,6 @@ rpciod_task_pending(void)
 static int
 rpciod(void *ptr)
 {
-       wait_queue_head_t *assassin = (wait_queue_head_t*) ptr;
        int             rounds = 0;
 
        lock_kernel();
@@ -992,11 +991,11 @@ rpciod(void *ptr)
                rpciod_killall();
        }
 
-       rpciod_pid = 0;
-       wake_up(assassin);
-
        dprintk("RPC: rpciod exiting\n");
        unlock_kernel();
+
+       rpciod_pid = 0;
+       complete_and_exit(&rpciod_killer, 0);
        return 0;
 }
 
@@ -1041,7 +1040,7 @@ rpciod_up(void)
        /*
         * Create the rpciod thread and wait for it to start.
         */
-       error = kernel_thread(rpciod, &rpciod_killer, 0);
+       error = kernel_thread(rpciod, NULL, 0);
        if (error < 0) {
                printk(KERN_WARNING "rpciod_up: create thread failed, error=%d\n", error);
                rpciod_users--;
@@ -1057,8 +1056,6 @@ out:
 void
 rpciod_down(void)
 {
-       unsigned long flags;
-
        down(&rpciod_sema);
        dprintk("rpciod_down pid %d sema %d\n", rpciod_pid, rpciod_users);
        if (rpciod_users) {
@@ -1073,27 +1070,8 @@ rpciod_down(void)
        }
 
        kill_proc(rpciod_pid, SIGKILL, 1);
-       /*
-        * Usually rpciod will exit very quickly, so we
-        * wait briefly before checking the process id.
-        */
-       clear_thread_flag(TIF_SIGPENDING);
-       yield();
-       /*
-        * Display a message if we're going to wait longer.
-        */
-       while (rpciod_pid) {
-               dprintk("rpciod_down: waiting for pid %d to exit\n", rpciod_pid);
-               if (signalled()) {
-                       dprintk("rpciod_down: caught signal\n");
-                       break;
-               }
-               interruptible_sleep_on(&rpciod_killer);
-       }
-       spin_lock_irqsave(&current->sighand->siglock, flags);
-       recalc_sigpending();
-       spin_unlock_irqrestore(&current->sighand->siglock, flags);
-out:
+       wait_for_completion(&rpciod_killer);
+ out:
        up(&rpciod_sema);
 }