summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorMike Galbraith <mgalbraith@suse.de>2012-07-11 22:05:20 (GMT)
committerScott Wood <scottwood@freescale.com>2014-04-10 00:19:38 (GMT)
commit36264b24dae7b283a7a67718a2112efc4138f853 (patch)
tree6cdf5041175ab66b334549cd4be27b3842285cf8 /fs
parent3db80947b547c8f76582f02811349f7573dee831 (diff)
downloadlinux-fsl-qoriq-36264b24dae7b283a7a67718a2112efc4138f853.tar.xz
fs, jbd: pull your plug when waiting for space
With an -rt kernel, and a heavy sync IO load, tasks can jam up on journal locks without unplugging, which can lead to terminal IO starvation. Unplug and schedule when waiting for space. Signed-off-by: Mike Galbraith <mgalbraith@suse.de> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Theodore Tso <tytso@mit.edu> Link: http://lkml.kernel.org/r/1341812414.7370.73.camel@marge.simpson.net Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'fs')
-rw-r--r--fs/jbd/checkpoint.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/jbd/checkpoint.c b/fs/jbd/checkpoint.c
index 08c0304..95debd7 100644
--- a/fs/jbd/checkpoint.c
+++ b/fs/jbd/checkpoint.c
@@ -129,6 +129,8 @@ void __log_wait_for_space(journal_t *journal)
if (journal->j_flags & JFS_ABORT)
return;
spin_unlock(&journal->j_state_lock);
+ if (current->plug)
+ io_schedule();
mutex_lock(&journal->j_checkpoint_mutex);
/*