xfs
[Top] [All Lists]

Re: [xfstests PATCH] loggen: remove deprecated header includes and add d

To: Dave Chinner <david@xxxxxxxxxxxxx>
Subject: Re: [xfstests PATCH] loggen: remove deprecated header includes and add definition for XFS_TRANS_MAGIC
From: Jeff Layton <jlayton@xxxxxxxxxxxxxxx>
Date: Mon, 12 May 2014 20:35:23 -0400
Cc: xfs@xxxxxxxxxxx
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <20140512230049.GO26353@dastard>
References: <1399898795-12967-1-git-send-email-jlayton@xxxxxxxxxxxxxxx> <20140512230049.GO26353@dastard>
On Tue, 13 May 2014 09:00:49 +1000
Dave Chinner <david@xxxxxxxxxxxxx> wrote:

> On Mon, May 12, 2014 at 08:46:35AM -0400, Jeff Layton wrote:
> > xfstests was failing to build on my rawhide box. The problem was that
> > some of the headers included by loggen.c no longer exist in current
> > releases. This just removes those includes and adds a conditional
> > definition of XFS_TRANS_MAGIC.
> > 
> > It may make more sense to just move XFS_TRANS_MAGIC to a different
> > header, but this seems to work on both f20 and rawhide boxes.
> > 
> > Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxxxxxxx>
> > ---
> >  src/loggen.c | 6 ++++--
> >  1 file changed, 4 insertions(+), 2 deletions(-)
> > 
> > diff --git a/src/loggen.c b/src/loggen.c
> > index 522c9178ee26..1740732249b6 100644
> > --- a/src/loggen.c
> > +++ b/src/loggen.c
> > @@ -26,8 +26,6 @@
> >   */
> >  
> >  #include <xfs/libxfs.h>
> > -#include <xfs/xfs_log.h>
> > -#include <xfs/xfs_log_priv.h>
> >  
> >  #ifndef ASSIGN_ANY_LSN_DISK
> >  #define ASSIGN_ANY_LSN_DISK(lsn,cycle,block)  \
> > @@ -37,6 +35,10 @@
> >      }
> >  #endif
> >  
> > +#ifndef XFS_TRANS_MAGIC
> > +#define    XFS_TRANS_MAGIC         0x5452414E      /* 'TRAN' */
> > +#endif
> 
> It's now defined as XFS_TRANS_HEADER_MAGIC, and defined in
> xfs/xfs_log_format.h.
> 
> So, some autoconf magic, perhaps?
> 
> Cheers,
> 
> Dave.

Ok, I'll see what I can cook up.

Thanks,
-- 
Jeff Layton <jlayton@xxxxxxxxxxxxxxx>

<Prev in Thread] Current Thread [Next in Thread>