34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
|
From 660c8a8fecfb47c43c5a17c2e35f3a1ef613331e Mon Sep 17 00:00:00 2001
|
||
|
|
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
||
|
|
Date: Thu, 23 Nov 2017 17:51:51 +0100
|
||
|
|
Subject: [PATCH 330/365] Revert "fs: jbd2: pull your plug when waiting for
|
||
|
|
space"
|
||
|
|
|
||
|
|
This reverts commit "fs: jbd2: pull your plug when waiting for space".
|
||
|
|
This was a duct-tape fix which shouldn't be needed since commit
|
||
|
|
"locking/rt-mutex: fix deadlock in device mapper / block-IO".
|
||
|
|
|
||
|
|
Cc: stable-rt@vger.kernel.org
|
||
|
|
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
||
|
|
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
|
||
|
|
---
|
||
|
|
fs/jbd2/checkpoint.c | 2 --
|
||
|
|
1 file changed, 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/fs/jbd2/checkpoint.c b/fs/jbd2/checkpoint.c
|
||
|
|
index bd8ab9c28869..addb0784dd1c 100644
|
||
|
|
--- a/fs/jbd2/checkpoint.c
|
||
|
|
+++ b/fs/jbd2/checkpoint.c
|
||
|
|
@@ -116,8 +116,6 @@ void __jbd2_log_wait_for_space(journal_t *journal)
|
||
|
|
nblocks = jbd2_space_needed(journal);
|
||
|
|
while (jbd2_log_space_left(journal) < nblocks) {
|
||
|
|
write_unlock(&journal->j_state_lock);
|
||
|
|
- if (current->plug)
|
||
|
|
- io_schedule();
|
||
|
|
mutex_lock(&journal->j_checkpoint_mutex);
|
||
|
|
|
||
|
|
/*
|
||
|
|
--
|
||
|
|
2.28.0
|
||
|
|
|