lkml.org 
[lkml]   [2017]   [Dec]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH RT 02/15] Revert "fs: jbd2: pull your plug when waiting for space"
On 2017-12-01 19:01:51 [-0500], Steven Rostedt wrote:
> 4.9.65-rt57-rc2 stable review patch.
> If anyone has any objections, please let me know.

I don't see that you pulled in
locking-rt-mutex-fix-deadlock-in-device-mapper-block.patch
|Subject: [PATCH] locking/rt-mutex: fix deadlock in device mapper / block-IO

which is needed before this can go in.

> ------------------
>
> From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
>
> 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 6e18a06aaabe..684996c8a3a4 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);
>
> /*

Sebastian

\
 
 \ /
  Last update: 2017-12-04 09:38    [W:0.081 / U:6.024 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site