xfs
[Top] [All Lists]

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

To: xfs@xxxxxxxxxxx
Subject: [xfstests PATCH] loggen: remove deprecated header includes and add definition for XFS_TRANS_MAGIC
From: Jeff Layton <jlayton@xxxxxxxxxxxxxxx>
Date: Mon, 12 May 2014 08:46:35 -0400
Delivered-to: xfs@xxxxxxxxxxx
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
+
 void
 usage(void)
 {
-- 
1.9.0

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