Minor cleanups.

diff --git a/lustre/lib/debug.c b/lustre/lib/debug.c
index cd0d5e2..9f6d9c5 100644 (file)
--- a/lustre/lib/debug.c
+++ b/lustre/lib/debug.c
@@ -117,24 +117,24 @@ int page_debug_check(char *who, void *addr, int end, __u64 off, __u64 id)
         ne_off = HTON__u64(off);
         id = HTON__u64(id);
         if (memcmp(addr, (char *)&ne_off, LPDS)) {
-                CERROR("%s: for offset "LPU64" off: "LPX64" != "LPX64"\n",
+                CERROR("%s: offset "LPU64" off: "LPX64" != "LPX64"\n",
                        who, off, *(__u64 *)addr, ne_off);
                 err = -EINVAL;
         }
         if (memcmp(addr + LPDS, (char *)&id, LPDS)) {
-                CERROR("%s: for offset "LPU64" id: "LPX64" != "LPX64"\n",
+                CERROR("%s: offset "LPU64" id: "LPX64" != "LPX64"\n",
                        who, off, *(__u64 *)(addr + LPDS), id);
                 err = -EINVAL;
         }
 
         addr += end - LPDS - LPDS;
         if (memcmp(addr, (char *)&ne_off, LPDS)) {
-                CERROR("%s: for offset "LPU64" end off: "LPX64" != "LPX64"\n",
+                CERROR("%s: offset "LPU64" end off: "LPX64" != "LPX64"\n",
                        who, off, *(__u64 *)addr, ne_off);
                 err = -EINVAL;
         }
         if (memcmp(addr + LPDS, (char *)&id, LPDS)) {
-                CERROR("%s: for offset "LPU64" end id: "LPX64" != "LPX64"\n",
+                CERROR("%s: offset "LPU64" end id: "LPX64" != "LPX64"\n",
                        who, off, *(__u64 *)(addr + LPDS), id);
                 err = -EINVAL;
         }

diff --git a/lustre/llite/Makefile.am b/lustre/llite/Makefile.am
index 1838bd1..b5d50b5 100644 (file)
--- a/lustre/llite/Makefile.am
+++ b/lustre/llite/Makefile.am
@@ -14,7 +14,8 @@ page.c:
 
 
 LINX=page.c
-llite_SOURCES =  dcache.c recover.c commit_callback.c page.c super.c rw.c file.c dir.c sysctl.c namei.c symlink.c
+llite_SOURCES = dcache.c recover.c commit_callback.c super.c rw.c
+llite_SOURCES += file.c dir.c sysctl.c namei.c symlink.c $(LINX)
 
 dist-hook:
        list='$(LINX)'; for f in $$list; do rm -f $(distdir)/$$f; done

diff --git a/lustre/obdecho/Makefile.am b/lustre/obdecho/Makefile.am
index 7f7a4b8..8539f01 100644 (file)
--- a/lustre/obdecho/Makefile.am
+++ b/lustre/obdecho/Makefile.am
@@ -8,7 +8,8 @@ MODULE = obdecho
 modulefs_DATA = obdecho.o
 EXTRA_PROGRAMS = obdecho
 
-obdecho_SOURCES = echo.c
+LINX=
+obdecho_SOURCES = echo.c $(LINX)
 
 include $(top_srcdir)/Rules
 

diff --git a/lustre/tests/Makefile.am b/lustre/tests/Makefile.am
index 896728a..0430d68 100644 (file)
--- a/lustre/tests/Makefile.am
+++ b/lustre/tests/Makefile.am
@@ -24,7 +24,7 @@ noinst_SCRIPTS = fs.sh intent-test.sh intent-test2.sh leak_finder.pl \
 pkglib_SCRIPTS = common.sh
 pkgcfg_DATA = lustre.cfg
 noinst_PROGRAMS = openunlink testreq truncate directio openme writeme mcreate
-noinst_PROGRAMS += munlink tchmod toexcl fsx #ldaptest 
+noinst_PROGRAMS += munlink tchmod toexcl fsx test_brw #ldaptest 
 
 # ldaptest_SOURCES = ldaptest.c
 tchmod_SOURCES = tchmod.c
@@ -38,5 +38,6 @@ openunlink_SOURCES = openunlink.c
 openme_SOURCES = openme.c
 writeme_SOURCES = writeme.c
 fsx_SOURCES = fsx.c
+test_brw_SOURCES = test_brw.c
 
 include $(top_srcdir)/Rules

diff --git a/lustre/tests/runiozone b/lustre/tests/runiozone
index d437988..9510ab0 100755 (executable)
--- a/lustre/tests/runiozone
+++ b/lustre/tests/runiozone
@@ -1,11 +1,13 @@
 #!/bin/sh
 SIZE=5g
 COUNT=0
+VERIFY="-+d"
+FILE=/mnt/lustre/test.$$
 [ $1 ] && SIZE=$1
 rm -f endiozone
 while date; do
        echo "Test #$COUNT"
-       iozone -i 0 -i 1 -f /mnt/lustre/test.$$ -s $SIZE 2>&1 || exit $?
+       iozone $VERIFY -r 64 -i 0 -i 1 -f $FILE -s $SIZE 2>&1 || exit $?
        COUNT=`expr $COUNT + 1`
        [ -f endiozone ] && rm endiozone && exit 0
 done | tee /tmp/iozone.log