Date: Mon, 29 Jun 2015 17:37:01 -0700
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: Willy Tarreau <w@1wt.eu>
Cc: Jari Ruusu <jariruusu@users.sourceforge.net>, linux-kernel@vger.kernel.org,
        stable@vger.kernel.org, Al Viro <viro@zeniv.linux.org.uk>
Subject: Re: [PATCH 3.10 14/46] d_walk() might skip too much
Message-ID: <20150630003701.GH6430@kroah.com>
References: <CACMCwJJiEFe9UFWgRRdmg1NBm1oiWGckK-FdO4k73vvG=T6ggw@mail.gmail.com>
 <CACMCwJ+0JhuoUgh2sEnJoZ3PGvwGoE6_WFOP4KbXsprirfSFWQ@mail.gmail.com>
 <20150613171118.GB13001@1wt.eu>
 <20150619195434.GA22717@kroah.com>
 <CACMCwJJ29Wuocf=zd8y5KV3RFdyEYenFt-B84Bz=Wes_Zy=QDg@mail.gmail.com>
 <20150627005216.GC29233@kroah.com>
 <20150627055619.GC21512@1wt.eu>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20150627055619.GC21512@1wt.eu>
User-Agent: Mutt/1.5.23+89 (0255b37be491) (2014-03-12)
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 3163
Lines: 62

On Sat, Jun 27, 2015 at 07:56:19AM +0200, Willy Tarreau wrote:
> On Fri, Jun 26, 2015 at 05:52:16PM -0700, Greg Kroah-Hartman wrote:
> > On Sat, Jun 20, 2015 at 10:41:14AM +0300, Jari Ruusu wrote:
> > > On 6/19/15, Greg Kroah-Hartman <gregkh@linuxfoundation.org> wrote:
> > > > I would much rather just include the "real" upstream patches, instead of
> > > > an odd backport.
> > > >
> > > > Jari, can you just backport the above referenced patches instead and
> > > > provide those backports?
> > > 
> > > I won't do that, sorry. It is more complicated than you think. It would
> > > involve backporting more VFS-re-write-patch-bombs than would be acceptable
> > > to stable kernel branch. Above mentioned d_walk() function that Al Viro
> > > modified in mainline don't even exist in 3.10.y and older brances.
> > > 
> > > My understanding is that complete backport of above mentioned "deal with
> > > deadlock in d_walk()" and "d_walk() might skip too much" patches to 3.10.y
> > > branch is to apply all these patches:
> > > 
> > > (a) backport of "deal with deadlock in d_walk()", by Ben Hutchings
> > > (b) dcache: Fix locking bugs in backported "deal with deadlock in d_walk()"
> > > (c) Al Viro's "d_walk() might skip too much" applied THREE times.
> > > 
> > > Of those, you merged (a) and (b) to 3.10.76 stable, and one copy of (c) to
> > > 3.10.80 stable.
> > > 
> > > The problem is that you didn't realize that "deal with deadlock in d_walk()"
> > > was applied to three different places in Ben Hutchings' backport, and that
> > > latest Al Viro's fix had to be also applied to three different places.
> > > Considering the sh*t that you have to deal with, nobody is blaming you for
> > > that mistake.
> > > 
> > > I am asking that you apply Al Viro's original "d_walk() might skip too much"
> > > patch TWO more times to 3.10.y stable branch. On both times, your patch tool
> > > will find the correct place of source file to modify, but with different
> > > offsets each time.
> > 
> > That's insane, and not how my tools work :(
> 
> No but I think it's just the patch command who found the proper location
> because the context was identical. That's what happens to me all the time
> with very old kernels, which is the reason why I must absolutely build
> them before the preview otherwise I'm sure to deliver something that
> doesn't even build :-)
> 
> > Can you provide the needed backport?  If it was in an earlier email in
> > this series, sorry, it's long gone from my mailbox, can you resend it?
> 
> Yes it was in the thread earlier this month. I'm appending it below. The
> following commits were referred to :
>   - ca5358e ("deal with deadlock in d_walk()")                                  
>   - 2159184 ("d_walk() might skip too much")                                    

Ok, that's a mess, thanks for clearing it up for me, I've now included
this in the 3.10-stable kernel.

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/