From a90d78c5da8f7ee5b75608c9cb75f2817f2f62b6 Mon Sep 17 00:00:00 2001
From: Nathan Scott <nathans@sgi.com>
Date: Tue, 27 Jun 2006 03:49:23 +0000
Subject: [PATCH] QA updates - make builds on older versions of headers work,
 reenable rt on bruce. Merge of master-melb:xfs-cmds:26356a by kenmcd.

---
 common.config  | 9 ++++-----
 common.rc      | 4 ++--
 ltp/fsstress.c | 4 ++++
 src/loggen.c   | 8 ++++++++
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/common.config b/common.config
index 23a3311e..730d48f3 100644
--- a/common.config
+++ b/common.config
@@ -156,7 +156,6 @@ known_hosts()
 		TEST_DEV=/dev/hdb2
 		TEST_LOGDEV=/dev/hdb3
 		SCRATCH_LOGDEV=/dev/hdb5
-	        #SCRATCH_RTDEV=/dev/hdb6
 		#RMT_TAPE_DEV=bruce:/dev/st0
 		#RMT_IRIXTAPE_DEV=snort:/dev/tape
 		#RMT_TAPE_USER=guest
@@ -164,13 +163,13 @@ known_hosts()
 	    bruce)
 		MODULAR=0
 		EMAIL="nathans@larry"
-		SCRATCH_MNT=/mnt/xfs0
+		SCRATCH_MNT=/mnt/scratch
 		SCRATCH_DEV=/dev/sdb5
-		#SCRATCH_RTDEV=/dev/sdc1
+		SCRATCH_RTDEV=/dev/sdc1
 		SCRATCH_LOGDEV=/dev/sda11
-		TEST_DIR=/mnt/xfs1
+		TEST_DIR=/mnt/test
 		TEST_DEV=/dev/sdc3
-		#TEST_RTDEV=/dev/sdb6
+		TEST_RTDEV=/dev/sdb6
 		TEST_LOGDEV=/dev/sda9
 		#TAPE_DEV=/dev/st0
 		#RMT_TAPE_DEV=bruce:/dev/st0
diff --git a/common.rc b/common.rc
index 83e1e17f..d6682d26 100644
--- a/common.rc
+++ b/common.rc
@@ -1172,9 +1172,9 @@ then
         fi
     fi
 
-    if [ "`_fs_type $TEST_DEV`" != "xfs" ]
+    if [ "`_fs_type $TEST_DEV`" != "$FSTYP" ]
     then
-        echo "common.rc: Error: \$TEST_DEV ($TEST_DEV) is not a MOUNTED XFS filesystem"
+        echo "common.rc: Error: \$TEST_DEV ($TEST_DEV) is not a MOUNTED $FSTYP filesystem"
         $DF_PROG $TEST_DEV
         exit 1
     fi
diff --git a/ltp/fsstress.c b/ltp/fsstress.c
index 27f7307c..308b9bb9 100644
--- a/ltp/fsstress.c
+++ b/ltp/fsstress.c
@@ -1659,6 +1659,7 @@ chown_f(int opno, long r)
 void
 setxattr_f(int opno, long r)
 {
+#ifdef XFS_XFLAG_EXTSIZE
 	struct fsxattr	fsx;
 	int		fd;
 	int		e;
@@ -1688,6 +1689,7 @@ setxattr_f(int opno, long r)
 		printf("%d/%d: setxattr %s %u %d\n", procid, opno, f.path, p, e);
 	free_pathname(&f);
 	close(fd);
+#endif
 }
 
 void
@@ -1743,9 +1745,11 @@ creat_f(int opno, long r)
 				a.fsx_xflags |= XFS_XFLAG_REALTIME;
 				a.fsx_extsize = extsize *
 						geom.rtextsize * geom.blocksize;
+#ifdef NOTYET
 			} else if (extsize) {
 				a.fsx_xflags |= XFS_XFLAG_EXTSIZE;
 				a.fsx_extsize = extsize * geom.blocksize;
+#endif
 			}
 			if (xfsctl(f.path, fd, XFS_IOC_FSSETXATTR, &a) < 0)
 				e1 = errno;
diff --git a/src/loggen.c b/src/loggen.c
index 4e3bd9ae..daa773b2 100644
--- a/src/loggen.c
+++ b/src/loggen.c
@@ -29,6 +29,14 @@
 #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(void)
 {
-- 
2.47.3