Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752680AbbD0HxZ (ORCPT ); Mon, 27 Apr 2015 03:53:25 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:48835 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752085AbbD0HxY (ORCPT ); Mon, 27 Apr 2015 03:53:24 -0400 Date: Mon, 27 Apr 2015 09:53:20 +0200 From: Greg Kroah-Hartman To: Ben Hutchings Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, Al Viro , hujianyang Subject: Re: [PATCH 3.10 27/31] deal with deadlock in d_walk() Message-ID: <20150427075320.GA1860@kroah.com> References: <20150426134209.255099785@linuxfoundation.org> <20150426134210.529222061@linuxfoundation.org> <1430097632.4063.156.camel@decadent.org.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1430097632.4063.156.camel@decadent.org.uk> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1561 Lines: 36 On Mon, Apr 27, 2015 at 02:20:32AM +0100, Ben Hutchings wrote: > On Sun, 2015-04-26 at 15:49 +0200, Greg Kroah-Hartman wrote: > > 3.10-stable review patch. If anyone has any objections, please let me know. > > > > ------------------ > > > > From: Al Viro > > > > commit ca5358ef75fc69fee5322a38a340f5739d997c10 upstream. > > > > ... by not hitting rename_retry for reasons other than rename having > > happened. In other words, do _not_ restart when finding that > > between unlocking the child and locking the parent the former got > > into __dentry_kill(). Skip the killed siblings instead... > > > > Signed-off-by: Al Viro > > Cc: Ben Hutchings > > [hujianyang: Backported to 3.10 refer to the work of Ben Hutchings in 3.2: > > - As we only have try_to_ascend() and not d_walk(), apply this > > change to all callers of try_to_ascend() > > - Adjust context to make __dentry_kill() apply to d_kill()] > > Signed-off-by: hujianyang > > Signed-off-by: Greg Kroah-Hartman > > This is broken; you need to fold in commit 20defcec264c from 3.2.y > ("dcache: Fix locking bugs in backported "deal with deadlock in > d_walk()""). Thanks for letting me know, now applied. greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/