Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf3bbcaf authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-sleep' 

* pm-sleep:
  PM / Sleep: JBD and JBD2 missing set_freezable()
parents 59fb53ea 35c80422

fs/jbd/journal.c

+2 −0
Original line number Diff line number Diff line
@@ -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);

fs/jbd2/journal.c

+2 −0
Original line number Diff line number Diff line
@@ -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);