mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 19:51:31 -04:00
jbd: check for error returned by kthread_create on creating journal thread
If the thread failed to create the subsequent wait_event will hang forever. This is likely to happen if kernel hits max_threads limit. Will be critical for virtualization systems that limit the number of tasks and kernel memory usage within the container. (akpm: JBD should be converted fully to the kthread API: kthread_should_stop() and kthread_stop()). Cc: <[email protected]> Cc: Christoph Hellwig <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
ee6f958291
commit
97f0678467
2 changed files with 18 additions and 8 deletions
|
|
@ -210,10 +210,16 @@ end_loop:
|
|||
return 0;
|
||||
}
|
||||
|
||||
static void jbd2_journal_start_thread(journal_t *journal)
|
||||
static int jbd2_journal_start_thread(journal_t *journal)
|
||||
{
|
||||
kthread_run(kjournald2, journal, "kjournald2");
|
||||
struct task_struct *t;
|
||||
|
||||
t = kthread_run(kjournald2, journal, "kjournald2");
|
||||
if (IS_ERR(t))
|
||||
return PTR_ERR(t);
|
||||
|
||||
wait_event(journal->j_wait_done_commit, journal->j_task != 0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void journal_kill_thread(journal_t *journal)
|
||||
|
|
@ -839,8 +845,7 @@ static int journal_reset(journal_t *journal)
|
|||
|
||||
/* Add the dynamic fields and write it to disk. */
|
||||
jbd2_journal_update_superblock(journal, 1);
|
||||
jbd2_journal_start_thread(journal);
|
||||
return 0;
|
||||
return jbd2_journal_start_thread(journal);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Reference in a new issue