PM / Sleep: JBD and JBD2 missing set_freezable()

With the latest and greatest changes to the freezer, I started seeing
panics that were caused by jbd2 running post-process freezing and
hitting the canary BUG_ON for non-TuxOnIce I/O submission. I've traced
this back to a lack of set_freezable calls in both jbd and jbd2. Since
they're clearly meant to be frozen (there are tests for freezing()), I
submit the following patch to add the missing calls.

Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>
Acked-by: Jan Kara <jack@suse.cz>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>

diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c
index 59c09f9541b5923c08ad1d227120dca764f8facf..89cd985aee06165a2ffc40fc01fb8ec366b025d1 100644 (file)
--- a/fs/jbd/journal.c
+++ b/fs/jbd/journal.c
@@ -129,6 +129,8 @@ static int kjournald(void *arg)
        setup_timer(&journal->j_commit_timer, commit_timeout,
                        (unsigned long)current);
 
+       set_freezable();
+
        /* Record that the journal thread is running */
        journal->j_task = current;
        wake_up(&journal->j_wait_done_commit);

diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index c0a5f9f1b1276b44c22a9f3cf6f8179c525bfcdf..663e47cbaa7810d398ad9dbd8f001de6d24c4776 100644 (file)
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -139,6 +139,8 @@ static int kjournald2(void *arg)
        setup_timer(&journal->j_commit_timer, commit_timeout,
                        (unsigned long)current);
 
+       set_freezable();
+
        /* Record that the journal thread is running */
        journal->j_task = current;
        wake_up(&journal->j_wait_done_commit);