Re: [PATCH 19/20] xfs: implement pNFS export operations

Jeff Layton
2015-02-08T14:09:52Z

On Sun, 8 Feb 2015 14:34:35 +0100
Christoph Hellwig <hch@lst.de> wrote:

> On Fri, Feb 06, 2015 at 05:42:58PM -0500, J. Bruce Fields wrote:
> > You'd basically just be pulling my tree (Christoph's is just my nfsd
> > tree with his patches on top, and I've been testing with exactly that
> > locally, just putting off pushing it out till we decide this.)
> >
> > So anyway, fine with me if you want to just pull that into the xfs tree.
> > Mine's ready whenever, so if I send my pull pretty soon after the merge
> > window and you send it a little later then we still keep the property
> > that Linus's merge still has a diffstat only in our respective areas.
> >
> > (OK, it's a little more complicated because I've got the same
> > arrangement with jlayton, so the order is jlayton's lock pull, then my
> > nfsd pull, then your xfs pull. Is this getting too complicated?
> > jlayton and I are both ready to so and I think it'd work.)
> >
> > I'm also fine with duplicating those few patches, or whatever.
>
> Maybe the better idea is to pull the xfs tree in the nfsd tree, but
> that would require Dave sending an early pull request so that the
> nfsd pull doesn't get delayed.
>
> Or we just defer the pnfsd merge. While I tried to get it in in time
> for 3.20 all the delays during review mean we're really late no and should
> punt it to 3.21.

FWIW, I plan to send a pull request for the locking changes as soon as
the merge window opens. Hopefully that won't be an issue for long...

--
Jeff Layton <jeff.layton@primarydata.com>