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

Merge of master-melb:xfs-cmds:26356a by kenmcd.

diff --git a/common.config b/common.config
index 23a3311e1afc2c61dfa5fdbb3062aa89a128dd86..730d48f311b7af35344790e971b5c19db9c59079 100644 (file)
--- a/common.config
+++ b/common.config
@@ -156,7 +156,6 @@ known_hosts()
                TEST_DEV=/dev/hdb2
                TEST_LOGDEV=/dev/hdb3
                SCRATCH_LOGDEV=/dev/hdb5
                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
                #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"
            bruce)
                MODULAR=0
                EMAIL="nathans@larry"

-               SCRATCH_MNT=/mnt/xfs0
+               SCRATCH_MNT=/mnt/scratch

                SCRATCH_DEV=/dev/sdb5
                SCRATCH_DEV=/dev/sdb5

-               #SCRATCH_RTDEV=/dev/sdc1
+               SCRATCH_RTDEV=/dev/sdc1

                SCRATCH_LOGDEV=/dev/sda11
                SCRATCH_LOGDEV=/dev/sda11

-               TEST_DIR=/mnt/xfs1
+               TEST_DIR=/mnt/test

                TEST_DEV=/dev/sdc3
                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
                TEST_LOGDEV=/dev/sda9
                #TAPE_DEV=/dev/st0
                #RMT_TAPE_DEV=bruce:/dev/st0

diff --git a/common.rc b/common.rc
index 83e1e17feaacecb2d7ee0831e9cb05a9181406ae..d6682d2648627b6e0ae67fc65207d541986e0f7f 100644 (file)
--- a/common.rc
+++ b/common.rc
@@ -1172,9 +1172,9 @@ then
         fi
     fi
 
         fi
     fi
 

-    if [ "`_fs_type $TEST_DEV`" != "xfs" ]
+    if [ "`_fs_type $TEST_DEV`" != "$FSTYP" ]

     then
     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
         $DF_PROG $TEST_DEV
         exit 1
     fi

diff --git a/ltp/fsstress.c b/ltp/fsstress.c
index 27f7307c2a667142dafd6b08244679798293650c..308b9bb95c03a81bfd0cd527a6d20a0a7dcc7b7d 100644 (file)
--- 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)
 {
 void
 setxattr_f(int opno, long r)
 {

+#ifdef XFS_XFLAG_EXTSIZE

        struct fsxattr  fsx;
        int             fd;
        int             e;
        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);
                printf("%d/%d: setxattr %s %u %d\n", procid, opno, f.path, p, e);
        free_pathname(&f);
        close(fd);

+#endif

 }
 
 void
 }
 
 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;
                                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;
                        } 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;
                        }
                        if (xfsctl(f.path, fd, XFS_IOC_FSSETXATTR, &a) < 0)
                                e1 = errno;

diff --git a/src/loggen.c b/src/loggen.c
index 4e3bd9aef1e7a147b7e41c71d863dd811b2d681d..daa773b2ebac325110013ba12212f0d7f8e8abd4 100644 (file)
--- a/src/loggen.c
+++ b/src/loggen.c
@@ -29,6 +29,14 @@
 #include <xfs/xfs_log.h>
 #include <xfs/xfs_log_priv.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)  \
+    { \
+       INT_SET(((uint *)&(lsn))[0], ARCH_CONVERT, (cycle)); \
+       INT_SET(((uint *)&(lsn))[1], ARCH_CONVERT, (block)); \
+    }
+#endif
+

 void
 usage(void)
 {
 void
 usage(void)
 {