[PATCH] reiserfs: remove final sleep_on

From: Chris Mason <mason@suse.com>

Get rid of the last sleep_on in the reiserfs code

diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c
index f885cda66255f56b388a1027f12de7bd69ae5679..78b95f54eb2fef08fd1b4671abb667efc2af6647 100644 (file)
--- a/fs/reiserfs/journal.c
+++ b/fs/reiserfs/journal.c
@@ -2464,8 +2464,20 @@ void reiserfs_wait_on_write_block(struct super_block *s) {
 }
 
 static void queue_log_writer(struct super_block *s) {
+    wait_queue_t wait;
     set_bit(WRITERS_QUEUED, &SB_JOURNAL(s)->j_state);
-    sleep_on(&SB_JOURNAL(s)->j_join_wait);
+
+    /*
+     * we don't want to use wait_event here because
+     * we only want to wait once.
+     */
+    init_waitqueue_entry(&wait, current);
+    add_wait_queue(&SB_JOURNAL(s)->j_join_wait, &wait);
+    set_current_state(TASK_UNINTERRUPTIBLE);
+    if (test_bit(WRITERS_QUEUED, &SB_JOURNAL(s)->j_state))
+        schedule();
+    current->state = TASK_RUNNING;
+    remove_wait_queue(&SB_JOURNAL(s)->j_join_wait, &wait);
 }
 
 static void wake_queued_writers(struct super_block *s) {