diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-03-16 21:49:32 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-03-16 21:49:32 +0100 |
| commit | cf3bbcaf09cb158590d1a9e0c0a6796d4fe92452 (patch) | |
| tree | fa402956cb925d3ac9e97c460da9f41ff40427d7 /fs | |
| parent | 59fb53ea75eef4aa029cf31c88cdacec2f7b794b (diff) | |
| parent | 35c80422afc8394d1ecbab3c0b17fcd539e4e5c2 (diff) | |
Merge branch 'pm-sleep'
* pm-sleep:
PM / Sleep: JBD and JBD2 missing set_freezable()
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/jbd/journal.c | 2 | ||||
| -rw-r--r-- | fs/jbd2/journal.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c index 59c09f9541b..89cd985aee0 100644 --- 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 c0a5f9f1b12..663e47cbaa7 100644 --- 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); |