QA updates - make builds on older versions of headers work, reenable rt on bruce.

[xfstests-dev.git] / src / loggen.c

diff --git a/src/loggen.c b/src/loggen.c
index 3dfab9de95b1cf3c1f04c8d87bff98592db2ec60..daa773b2ebac325110013ba12212f0d7f8e8abd4 100644 (file)
--- a/src/loggen.c
+++ b/src/loggen.c
@@ -1,33 +1,19 @@
 /*
- * Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2003 Silicon Graphics, Inc.
+ * All Rights Reserved.
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation.
  *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * This program is distributed in the hope that it would be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write the Free Software Foundation,
+ * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
  
 /*
@@ -43,8 +29,16 @@
 #include <xfs/xfs_log.h>
 #include <xfs/xfs_log_priv.h>
 
+#ifndef ASSIGN_ANY_LSN_DISK
+#define ASSIGN_ANY_LSN_DISK(lsn,cycle,block)  \
+    { \
+       INT_SET(((uint *)&(lsn))[0], ARCH_CONVERT, (cycle)); \
+       INT_SET(((uint *)&(lsn))[1], ARCH_CONVERT, (block)); \
+    }
+#endif
+
 void
-usage()
+usage(void)
 {
     fprintf(stderr,"Usage: loggen\n"
                    "           set up parameters before writing record(s):\n"
@@ -86,7 +80,7 @@ loggen_alloc(int blocks)
 }
 
 void
-loggen_write()
+loggen_write(void)
 {         
     if (!buf) {
         fprintf(stderr,"no buffer allocated\n");
@@ -108,7 +102,7 @@ loggen_zero(int count)
     fprintf(stderr,"   *** zero block (1BB) x %d\n", count);
     loggen_alloc(1);
     while (count--)
-        loggen_write(count);
+        loggen_write();
 }      
       
 void
@@ -146,8 +140,7 @@ loggen_unmount(int count)
     INT_SET(head->h_cycle_data[0],  ARCH_CONVERT, 0xb0c0d0d0);
     INT_SET(head->h_fmt,            ARCH_CONVERT, param_fmt);
     
-    ASSIGN_ANY_LSN(head->h_tail_lsn,    
-            param_tail_cycle, param_tail_block, ARCH_CONVERT);
+    ASSIGN_ANY_LSN_DISK(head->h_tail_lsn, param_tail_cycle, param_tail_block);
 
     memcpy(head->h_fs_uuid,  param_uuid, sizeof(uuid_t));
 
@@ -163,10 +156,10 @@ loggen_unmount(int count)
     memcpy(op+1, &magic, sizeof(magic));
     
     while (count--) {
-        ASSIGN_ANY_LSN(head->h_lsn,         
-                param_cycle, param_block++, ARCH_CONVERT);
+        ASSIGN_ANY_LSN_DISK(head->h_lsn,         
+                param_cycle, param_block++);
         
-        loggen_write(count);
+        loggen_write();
     }
 } 
   
@@ -214,8 +207,8 @@ loggen_empty(int count)
     INT_SET(head->h_cycle_data[0],  ARCH_CONVERT, 0xb0c0d0d0);
     INT_SET(head->h_fmt,            ARCH_CONVERT, param_fmt);
     
-    ASSIGN_ANY_LSN(head->h_tail_lsn,    
-            param_tail_cycle, param_tail_block, ARCH_CONVERT);
+    ASSIGN_ANY_LSN_DISK(head->h_tail_lsn,    
+            param_tail_cycle, param_tail_block);
 
     memcpy(head->h_fs_uuid,  param_uuid, sizeof(uuid_t));
 
@@ -265,10 +258,10 @@ loggen_empty(int count)
     INT_SET(op5->oh_res2,           ARCH_CONVERT, 0);
 
     while (count--) {
-        ASSIGN_ANY_LSN(head->h_lsn,         
-                param_cycle, param_block++, ARCH_CONVERT);
+        ASSIGN_ANY_LSN_DISK(head->h_lsn,         
+                param_cycle, param_block++);
         
-        loggen_write(count);
+        loggen_write();
     }
 }   
 
@@ -319,5 +312,3 @@ main(int argc, char *argv[])
     }
     return 0;   
 }
-
-