From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753391AbdLDIiM (ORCPT ); Mon, 4 Dec 2017 03:38:12 -0500 Received: from Galois.linutronix.de ([146.0.238.70]:57091 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751205AbdLDIiL (ORCPT ); Mon, 4 Dec 2017 03:38:11 -0500 Date: Mon, 4 Dec 2017 09:37:53 +0100 From: Sebastian Andrzej Siewior To: Steven Rostedt Cc: linux-kernel@vger.kernel.org, linux-rt-users , Thomas Gleixner , Carsten Emde , John Kacur , Paul Gortmaker , Julia Cartwright , Daniel Wagner , tom.zanussi@linux.intel.com, Alex Shi , stable-rt@vger.kernel.org Subject: Re: [PATCH RT 02/15] Revert "fs: jbd2: pull your plug when waiting for space" Message-ID: <20171204083752.GA2255@linutronix.de> References: <20171202000149.842718953@goodmis.org> <20171202000427.022777641@goodmis.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20171202000427.022777641@goodmis.org> User-Agent: Mutt/1.9.1 (2017-09-22) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > > 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 > Signed-off-by: Steven Rostedt (VMware) > --- > 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