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 <viro@xxxxxxxxxxxxxxxxxx> > > > > 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 <viro@xxxxxxxxxxxxxxxxxx> > > Cc: Ben Hutchings <ben@xxxxxxxxxxxxxxx> > > [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 <hujianyang@xxxxxxxxxx> > > Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > > 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 stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html