From: Dave Chinner <david@fromorbit.com>
To: Jeff Layton <jlayton@poochiereds.net>
Cc: xfs@oss.sgi.com
Subject: Re: [xfstests PATCH] loggen: remove deprecated header includes and add definition for XFS_TRANS_MAGIC
Date: Tue, 13 May 2014 09:00:49 +1000 [thread overview]
Message-ID: <20140512230049.GO26353@dastard> (raw)
In-Reply-To: <1399898795-12967-1-git-send-email-jlayton@poochiereds.net>
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@poochiereds.net>
> ---
> 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.
--
Dave Chinner
david@fromorbit.com
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2014-05-12 23:01 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-12 12:46 [xfstests PATCH] loggen: remove deprecated header includes and add definition for XFS_TRANS_MAGIC Jeff Layton
2014-05-12 23:00 ` Dave Chinner [this message]
2014-05-13 0:35 ` Jeff Layton
2014-05-13 11:54 ` [PATCH] loggen: fix build vs. newer xfsprogs headers Jeff Layton
2014-05-13 12:00 ` Jeff Layton
2014-05-13 12:04 ` [xfstests PATCH v2] " Jeff Layton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140512230049.GO26353@dastard \
--to=david@fromorbit.com \
--cc=jlayton@poochiereds.net \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox