[PATCH 10/15] Revert "fs, jbd: pull your plug when waiting for space"

From
Tom Zanussi <zanussi@kernel.org>
Date
2018-08-14 21:43:34
Reply to
Tom Zanussi, 2018-08-14
v3.18.117-rt105 rt-stable review patch.  If anyone has any objections,
please let me know.

------------------

From: Tom Zanussi <redacted>

This reverts stable-rt commit 3b5cf23e6b87a938522eb074baeb034e66dc9cb3.

Similar to commit d5bc2c7b2cc0 Revert "fs: jbd2: pull your plug when
waiting for space", according to Sebastian Siewior: this "is the same
thing but for ext3/jbd.  The code was removed at some point so I did
not revert in my tree."
From the original commit message: "This was a duct-tape fix which
shouldn't be needed since commit "locking/rt-mutex: fix deadlock in
device mapper / block-IO".

Cc: <redacted>
Signed-off-by: Tom Zanussi <redacted>
---
 fs/jbd/checkpoint.c | 2 --
 1 file changed, 2 deletions(-)
diff --git a/fs/jbd/checkpoint.c b/fs/jbd/checkpoint.c
index 95debd71e5fa..08c03044abdd 100644
--- a/fs/jbd/checkpoint.c
+++ b/fs/jbd/checkpoint.c
@@ -129,8 +129,6 @@ 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);
 
 		/*
-- 
2.14.1
Thread (18 messages) 18 messages, 2 authors, last reply 2018-08-14
Keyboard shortcuts
hback out one level
jnext message in thread / next series-diff position
kprevious message in thread / previous series-diff position
ldrill in
Escclose help / fold thread tree
?toggle this help