1 files changed, 12 insertions, 23 deletions

diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c
index d27bac6acaa3..0b348b13b551 100644
--- a/fs/jfs/jfs_logmgr.c
+++ b/fs/jfs/jfs_logmgr.c
@@ -64,6 +64,7 @@
 #include <linux/interrupt.h>
 #include <linux/smp_lock.h>
 #include <linux/completion.h>
+#include <linux/kthread.h>
 #include <linux/buffer_head.h>          /* for sync_blockdev() */
 #include <linux/bio.h>
 #include <linux/suspend.h>
@@ -81,15 +82,14 @@
  */
 static struct lbuf *log_redrive_list;
 static DEFINE_SPINLOCK(log_redrive_lock);
-DECLARE_WAIT_QUEUE_HEAD(jfs_IO_thread_wait);
 
 
 /*
  *      log read/write serialization (per log)
  */
-#define LOG_LOCK_INIT(log)      init_MUTEX(&(log)->loglock)
-#define LOG_LOCK(log)           down(&((log)->loglock))
-#define LOG_UNLOCK(log)         up(&((log)->loglock))
+#define LOG_LOCK_INIT(log)      mutex_init(&(log)->loglock)
+#define LOG_LOCK(log)           mutex_lock(&((log)->loglock))
+#define LOG_UNLOCK(log)         mutex_unlock(&((log)->loglock))
 
 
 /*
@@ -1105,11 +1105,10 @@ int lmLogOpen(struct super_block *sb)
                 }
         }
 
-        if (!(log = kmalloc(sizeof(struct jfs_log), GFP_KERNEL))) {
+        if (!(log = kzalloc(sizeof(struct jfs_log), GFP_KERNEL))) {
                 up(&jfs_log_sem);
                 return -ENOMEM;
         }
-        memset(log, 0, sizeof(struct jfs_log));
         INIT_LIST_HEAD(&log->sb_list);
         init_waitqueue_head(&log->syncwait);
 
@@ -1181,9 +1180,8 @@ static int open_inline_log(struct super_block *sb)
         struct jfs_log *log;
         int rc;
 
-        if (!(log = kmalloc(sizeof(struct jfs_log), GFP_KERNEL)))
+        if (!(log = kzalloc(sizeof(struct jfs_log), GFP_KERNEL)))
                 return -ENOMEM;
-        memset(log, 0, sizeof(struct jfs_log));
         INIT_LIST_HEAD(&log->sb_list);
         init_waitqueue_head(&log->syncwait);
 
@@ -1216,12 +1214,11 @@ static int open_dummy_log(struct super_block *sb)
 
         down(&jfs_log_sem);
         if (!dummy_log) {
-                dummy_log = kmalloc(sizeof(struct jfs_log), GFP_KERNEL);
+                dummy_log = kzalloc(sizeof(struct jfs_log), GFP_KERNEL);
                 if (!dummy_log) {
                         up(&jfs_log_sem);
                         return -ENOMEM;
                 }
-                memset(dummy_log, 0, sizeof(struct jfs_log));
                 INIT_LIST_HEAD(&dummy_log->sb_list);
                 init_waitqueue_head(&dummy_log->syncwait);
                 dummy_log->no_integrity = 1;
@@ -1980,7 +1977,7 @@ static inline void lbmRedrive(struct lbuf *bp)
         log_redrive_list = bp;
         spin_unlock_irqrestore(&log_redrive_lock, flags);
 
-        wake_up(&jfs_IO_thread_wait);
+        wake_up_process(jfsIOthread);
 }
 
 
@@ -2347,13 +2344,7 @@ int jfsIOWait(void *arg)
 {
         struct lbuf *bp;
 
-        daemonize("jfsIO");
-
-        complete(&jfsIOwait);
-
         do {
-                DECLARE_WAITQUEUE(wq, current);
-
                 spin_lock_irq(&log_redrive_lock);
                 while ((bp = log_redrive_list) != 0) {
                         log_redrive_list = bp->l_redrive_next;
@@ -2362,21 +2353,19 @@ int jfsIOWait(void *arg)
                         lbmStartIO(bp);
                         spin_lock_irq(&log_redrive_lock);
                 }
+                spin_unlock_irq(&log_redrive_lock);
+
                 if (freezing(current)) {
-                        spin_unlock_irq(&log_redrive_lock);
                         refrigerator();
                 } else {
-                        add_wait_queue(&jfs_IO_thread_wait, &wq);
                         set_current_state(TASK_INTERRUPTIBLE);
-                        spin_unlock_irq(&log_redrive_lock);
                         schedule();
                         current->state = TASK_RUNNING;
-                        remove_wait_queue(&jfs_IO_thread_wait, &wq);
                 }
-        } while (!jfs_stop_threads);
+        } while (!kthread_should_stop());
 
         jfs_info("jfsIOWait being killed!");
-        complete_and_exit(&jfsIOwait, 0);
+        return 0;
 }
 
 /*