Merge branch 'pm-sleep' · tjh.dev/kernel@cf3bbca

tjh.dev / kernel

fork atom

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

fork atom

Merge branch 'pm-sleep'

* pm-sleep:
PM / Sleep: JBD and JBD2 missing set_freezable()

Rafael J. Wysocki 14 years ago cf3bbcaf 59fb53ea

2 changed files

expand all

jbd

journal.c

jbd2

journal.c

fs/jbd/journal.c

··· 129 129 setup_timer(&journal->j_commit_timer, commit_timeout, 130 130 (unsigned long)current); 131 131 132 + set_freezable(); 133 + 132 134 /* Record that the journal thread is running */ 133 135 journal->j_task = current; 134 136 wake_up(&journal->j_wait_done_commit);

fs/jbd2/journal.c

··· 139 139 setup_timer(&journal->j_commit_timer, commit_timeout, 140 140 (unsigned long)current); 141 141 142 + set_freezable(); 143 + 142 144 /* Record that the journal thread is running */ 143 145 journal->j_task = current; 144 146 wake_up(&journal->j_wait_done_commit);