1 files changed, 9 insertions, 5 deletions

diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index 44fc32bfd7f1..78d63b818f0b 100644
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -28,7 +28,6 @@
 #include <linux/jbd2.h>
 #include <linux/errno.h>
 #include <linux/slab.h>
-#include <linux/smp_lock.h>
 #include <linux/init.h>
 #include <linux/mm.h>
 #include <linux/freezer.h>
@@ -211,10 +210,16 @@ end_loop:
         return 0;
 }
 
-static void jbd2_journal_start_thread(journal_t *journal)
+static int jbd2_journal_start_thread(journal_t *journal)
 {
-        kthread_run(kjournald2, journal, "kjournald2");
+        struct task_struct *t;
+
+        t = kthread_run(kjournald2, journal, "kjournald2");
+        if (IS_ERR(t))
+                return PTR_ERR(t);
+
         wait_event(journal->j_wait_done_commit, journal->j_task != 0);
+        return 0;
 }
 
 static void journal_kill_thread(journal_t *journal)
@@ -840,8 +845,7 @@ static int journal_reset(journal_t *journal)
 
         /* Add the dynamic fields and write it to disk. */
         jbd2_journal_update_superblock(journal, 1);
-        jbd2_journal_start_thread(journal);
-        return 0;
+        return jbd2_journal_start_thread(journal);
 }
 
 /**