Skip to content

Commit

Permalink
PM / Sleep: JBD and JBD2 missing set_freezable()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Nigel Cunningham authored and rjwysocki committed Mar 13, 2012
1 parent 37f08be commit 35c8042
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
2 changes: 2 additions & 0 deletions fs/jbd/journal.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 2 additions & 0 deletions fs/jbd2/journal.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 35c8042

Please sign in to comment.