Re: [patch 00/48] 2.6.27.32-stable review

[Joel Becker]

On Wed, Sep 09, 2009 at 06:23:40AM -0700, Greg KH wrote:
> On Wed, Sep 09, 2009 at 11:31:50AM +0400, Michael Tokarev wrote:
> > > On Tue, Sep 08, 2009 at 09:47:51AM -0500, Jayson King wrote:
> > > > A line from the upstream patch is missing in this patch:
> > > > 
> > > >   static int ocfs2_write_cluster(struct address_space *mapping,
> > > >                      u32 phys, unsigned int unwritten,
> > > > +                   unsigned int should_zero,
> > > >                      struct ocfs2_alloc_context *data_ac,
> > > >                      struct ocfs2_alloc_context *meta_ac,
> > > >                      struct ocfs2_write_ctxt *wc, u32 cpos,
> > > >                      loff_t user_pos, unsigned user_len)

<snip>

> >  ocfs2-initialize-the-cluster-we-re-writing-to-in-a-non-sparse-extend.patch
> >  ocfs2-ocfs2_write_begin_nolock-should-handle-len-0.patch
> > Neither of which looks like an addon, and only one (the first)
> > has references to this "should_zero" variable.
> 
> I thought the second one would solve the problem.
> 
> What happened here, I took the upstream patch, was it incorrect?  If so,
> was there a patch, also upstream, that fixed this problem?

	The upstream first patch is
e7432675f8ca868a4af365759a8d4c3779a3d922.  It has this line.  The second
patch fixes a bug in the first patch, but the bug is not around this
line, it's totally separate.
	Ok, I'm confused.  In linux-2.6-stable.git, the 2.6.30.y branch
has this for the diff:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6-stable.git;a=blobdiff;f=fs/ocfs2/aops.c;h=122fb7978f60f7dde54ac0567f578159900f163b;hp=b2c52b3a1484f1c57c4b098bf9706fe21c186ac0;hb=9baf278cca4043a1312f3a40bf17b979b6238ebc;hpb=8c668814e3e2be7d633447bf6e78237d4cedabb7
It has the correct line.
	But in 2.6.27.y branch, referencing the same upstream commit,
there is this diff:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6-stable.git;a=blobdiff;f=fs/ocfs2/aops.c;h=50bb561860dfb5ee024e7a992bb4d72bc71f0372;hp=a53da1466277abd843b0117f89df9850423ba92b;hb=8338941200d9188e3c866dd16cc2848754947895;hpb=7e8287379470a7c18153be389c9516e31ae141f3
It is missing the line.  I think the cherry-pick for 2.6.27.y got
broken.

Joel

-- 

"If you are ever in doubt as to whether or not to kiss a pretty girl, 
 give her the benefit of the doubt"
                                        -Thomas Carlyle

Joel Becker
Principal Software Developer
Oracle
E-mail: joel.becker@xxxxxxxxxx
Phone: (650) 506-8127
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/