Merge branch 'pm-sleep'
* pm-sleep: PM / Sleep: JBD and JBD2 missing set_freezable()
This commit is contained in:
commit
cf3bbcaf09
2 changed files with 4 additions and 0 deletions
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue