X-Git-Url: http://git.apps.os.sepia.ceph.com/?p=xfstests-dev.git;a=blobdiff_plain;f=src%2Floggen.c;h=ed1ebbccc8baa0f8c84f8806225fd2ce4f3ae796;hp=ab476887f7b756e0ae65d64d3dabaf2b29425686;hb=836ed899ae22aef23380327762007ed4684fd4ff;hpb=90eed13c43dff6c3f8a794bb5406aac43223b06e

diff --git a/src/loggen.c b/src/loggen.c
index ab476887..ed1ebbcc 100644
--- a/src/loggen.c
+++ b/src/loggen.c
@@ -25,9 +25,16 @@
  *                                                  - dxm 29/09/00
  */
 
+#include <config.h>
+
 #include <xfs/libxfs.h>
+#ifdef HAVE_XFS_XFS_LOG_FORMAT_H
+#include <xfs/xfs_log_format.h>
+#define XFS_TRANS_MAGIC	XFS_TRANS_HEADER_MAGIC
+#else /* HAVE_XFS_XFS_LOG_FORMAT_H */
 #include <xfs/xfs_log.h>
 #include <xfs/xfs_log_priv.h>
+#endif /* HAVE_XFS_XFS_LOG_FORMAT_H */
 
 #ifndef ASSIGN_ANY_LSN_DISK
 #define ASSIGN_ANY_LSN_DISK(lsn,cycle,block)  \
@@ -112,9 +119,9 @@ loggen_unmount(int count)
     xlog_op_header_t        *op;
     /* the data section must be 32 bit size aligned */
     struct {
-        __uint16_t magic;
-        __uint16_t pad1;
-        __uint32_t pad2; /* may as well make it 64 bits */
+        uint16_t magic;
+        uint16_t pad1;
+        uint32_t pad2; /* may as well make it 64 bits */
     } magic = { XLOG_UNMOUNT_TYPE, 0, 0 };
     
     if (!count) count=1;
@@ -134,7 +141,6 @@ loggen_unmount(int count)
     head->h_cycle = cpu_to_be32(param_cycle);
     head->h_version = cpu_to_be32(1);
     head->h_len = cpu_to_be32(20);
-    head->h_chksum = cpu_to_be32(0);
     head->h_prev_block = cpu_to_be32(-1);
     head->h_num_logops = cpu_to_be32(1);
     head->h_cycle_data[0] = cpu_to_be32(0xb0c0d0d0);
@@ -202,7 +208,6 @@ loggen_empty(int count)
                                                     sizeof(xfs_trans_header_t)+
                                                     sizeof(xfs_buf_log_format_t)+
                                                     sizeof(int));
-    head->h_chksum         = cpu_to_be32(0);
     head->h_prev_block     = cpu_to_be32(-1);
     head->h_num_logops     = cpu_to_be32(5);
     head->h_cycle_data[0]  = cpu_to_be32(0xb0c0d0d0);
@@ -239,7 +244,11 @@ loggen_empty(int count)
     /* an empty buffer too */
     blfs.blf_type       = XFS_LI_BUF;
     blfs.blf_size       = 2;
+#ifdef XFS_BLF_CANCEL
+    blfs.blf_flags      = XFS_BLF_CANCEL;
+#else
     blfs.blf_flags      = XFS_BLI_CANCEL;
+#endif
     blfs.blf_len        = 0;
     blfs.blf_blkno      = 1;
     blfs.blf_map_size   = 1;