Re: [PATCH TARBALL, DEV ONLY] xfsprogs: metadata CRC support V2

From: Dave Chinner <david@fromorbit.com>
To: Mark Tinguely <tinguely@sgi.com>
Cc: xfs@oss.sgi.com
Subject: Re: [PATCH TARBALL, DEV ONLY] xfsprogs: metadata CRC support V2
Date: Tue, 30 Apr 2013 22:03:06 +1000	[thread overview]
Message-ID: <20130430120306.GL23072@dastard> (raw)
In-Reply-To: <20130429220952.GB23072@dastard>

On Tue, Apr 30, 2013 at 08:09:52AM +1000, Dave Chinner wrote:
> On Mon, Apr 29, 2013 at 04:33:29PM -0500, Mark Tinguely wrote:
> > On 04/25/13 16:40, Dave Chinner wrote:
> > >On Thu, Apr 25, 2013 at 04:12:04PM -0500, Mark Tinguely wrote:
> > Index: b/include/xfs/xfs_dir2_format.h
> > ===================================================================
> > --- a/include/xfs/xfs_dir2_format.h
> > +++ b/include/xfs/xfs_dir2_format.h
> > @@ -40,7 +40,6 @@
> >   */
> >  typedef	__uint16_t	xfs_dir2_data_off_t;
> >  #define	NULLDATAOFF	0xffffU
> > -typedef uint		xfs_dir2_data_aoff_t;	/* argument form */
> 
> This file is common with the kernel code, so whatever other
> definition it conflicts with is the one to remove.
> 
> > @@ -61,11 +60,6 @@ typedef	__uint32_t	xfs_dir2_dataptr_t;
> >  typedef	xfs_off_t	xfs_dir2_off_t;
> > 
> >  /*
> > - * Directory block number (logical dirblk in file)
> > - */
> > -typedef	__uint32_t	xfs_dir2_db_t;
> 
> Same here.

So looking at this in more detail, the reason these got added to
xfs_dir2.h was that there are a bunch of function prototypes I had
to move from xfs_dir2_priv.h to xfs_dir2.h so that they were visible
outside libxfs. This is one of the changes I need to propagate back
into the kernel code to bring the kernel headers inline with what is
needed by userspace.

So as a temporary measure, the above patch that just removes them
from xfs_dir2_format.h is OK. I'll fold these into the current
patchset.

Cheers,

Dave.
-- 
Dave Chinner
david@fromorbit.com

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs