I'm a moron and spin_unlock was a no-op.

[fs/lustre-release.git] / lustre / llite / commit_callback.c

diff --git a/lustre/llite/commit_callback.c b/lustre/llite/commit_callback.c
index fed2b3d..741c734 100644 (file)
--- a/lustre/llite/commit_callback.c
+++ b/lustre/llite/commit_callback.c
@@ -63,6 +63,7 @@ static int ll_commitcbd_main(void *arg)
         spin_unlock_irq(&current->sigmask_lock);
 
         sprintf(current->comm, "lustre_commitcbd");
+        unlock_kernel();
 
         /* Record that the  thread is running */
         sbi->ll_commitcbd_waketime = CURRENT_TIME;
@@ -73,9 +74,8 @@ static int ll_commitcbd_main(void *arg)
 
         /* And now, loop forever on requests */
         while (1) {
-                wait_event_interruptible
-                        (sbi->ll_commitcbd_waitq, 
-                         ll_commitcbd_check_event(sbi));
+                wait_event(sbi->ll_commitcbd_waitq, 
+                           ll_commitcbd_check_event(sbi));
 
                 spin_lock(&sbi->ll_commitcbd_lock);
                 if (sbi->ll_commitcbd_flags & LL_COMMITCBD_STOPPING) {
@@ -84,8 +84,6 @@ static int ll_commitcbd_main(void *arg)
                         EXIT;
                         break;
                 }
-                if (!list_empty(&sbi->ll_mds_client.cli_replied_head))
-                        CERROR("** clean up committed reqs here **\n"); 
 
                 schedule_timeout(sbi->ll_commitcbd_timeout);
                 CERROR("commit callback daemon woken up - FIXME\n"); 
@@ -123,8 +121,7 @@ int ll_commitcbd_cleanup(struct ll_sb_info *sbi)
         sbi->ll_commitcbd_flags = LL_COMMITCBD_STOPPING;
 
         wake_up(&sbi->ll_commitcbd_waitq);
-        wait_event_interruptible
-                (sbi->ll_commitcbd_ctl_waitq,
-                 sbi->ll_commitcbd_flags & LL_COMMITCBD_STOPPED);
+        wait_event(sbi->ll_commitcbd_ctl_waitq,
+                   sbi->ll_commitcbd_flags & LL_COMMITCBD_STOPPED);
         RETURN(0);
 }