On Fri, Oct 16, 2015 at 12:44:53PM +1100, Dave Chinner wrote:
> Hi folks,
>
> Turns out that changes to exported XFS headers in xfsprogs v4.2.0
> broke the xfsdump build. the XFS dump build was implicitly including
> the platform definitions calculated for the xfsprogs build and so
> removing them from the xfsprogs headers made xfsdump very unhappy.
>
...
>
> So, now the code base is a little bit cleaner, a lot less dependent
> on the xfsprogs header files, compiles cleanly on xfsprogs 3.2.x and
> 4.x releases, can easily have asserts build in or excluded (distro
> packages need to use "export DEBUG=-DNDEBUG" to exclude asserts),
> passes xfstests with asserts enabled and disabled, and best of all
> the source code is a little less eye-bleedy.
>
> I really don't expect anyone to review this closely - it's *huge*
> chunk of boring search/replace change:
>
> 94 files changed, 2929 insertions(+), 2652 deletions(-)
>
> but I would like people to comment on/ack the approach I've taken
> here. If nobody objects/cares, I'll then do a 3.1.6 release early
> next week....
>
I sent some comments on patch 1, otherwise the rest looks reasonable to
me on a quick pass through. The only thing I noticed is that the series
introduced a handful of whitespace problems. I didn't go and track them
into the individual patches, but here's the full output from my patch
import:
Applying: cleanup: get rid of ASSERT
/home/bfoster/repos/xfsdump/.git/rebase-apply/patch:3725: space before tab in indent.
assert( namebuf );
/home/bfoster/repos/xfsdump/.git/rebase-apply/patch:5656: trailing whitespace.
assert ( ent != NULL );
/home/bfoster/repos/xfsdump/.git/rebase-apply/patch:5855: trailing whitespace.
assert ( ent != NULL );
warning: 3 lines add whitespace errors.
Applying: build: don't rely on xfs/xfs.h to include necessary headers
Applying: cleanup: kill intgen_t
/home/bfoster/repos/xfsdump/.git/rebase-apply/patch:2018: trailing whitespace.
static int
/home/bfoster/repos/xfsdump/.git/rebase-apply/patch:3295: space before tab in indent.
int fsfd,
/home/bfoster/repos/xfsdump/.git/rebase-apply/patch:6044: trailing whitespace.
int namebuflen;
warning: 3 lines add whitespace errors.
Applying: cleanup: kill u_int*_t types
/home/bfoster/repos/xfsdump/.git/rebase-apply/patch:255: trailing whitespace.
static uint32_t erase_and_verify( drive_t *drivep );
/home/bfoster/repos/xfsdump/.git/rebase-apply/patch:1372: trailing whitespace.
uint s_max_nstreams;/* number of media streams in
/home/bfoster/repos/xfsdump/.git/rebase-apply/patch:1461: trailing whitespace.
DEBUG_displayallsessions( int fd, invt_seshdr_t *hdr, uint ref,
/home/bfoster/repos/xfsdump/.git/rebase-apply/patch:1816: trailing whitespace.
uint16_t d_sum;
warning: 4 lines add whitespace errors.
Applying: cleanup: define a local xfs_ino_t
Applying: cleanup: use system uuid.h headers
Applying: cleanup: move fold_t out of util.h
/home/bfoster/repos/xfsdump/.git/rebase-apply/patch:85: trailing whitespace.
/* flg definitions for preemptchk
warning: 1 line adds whitespace errors.
Applying: cleanup: Kill unnecessary xfs includes
Brian
> -Dave.
>
> _______________________________________________
> xfs mailing list
> xfs@xxxxxxxxxxx
> http://oss.sgi.com/mailman/listinfo/xfs
_______________________________________________
xfs mailing list
xfs@xxxxxxxxxxx
http://oss.sgi.com/mailman/listinfo/xfs
