Quiet compiler warning in fsx on ia64.

Don't remount the filesystem on the client each time if running the
replay/recovery tests multiple times.

diff --git a/lustre/tests/fsx.c b/lustre/tests/fsx.c
index 12027d0..c87cd6a 100644 (file)
--- a/lustre/tests/fsx.c
+++ b/lustre/tests/fsx.c
@@ -557,18 +557,18 @@ alloc_tf_buf(void)
        max_tf_len = sprintf(tf_buf, "%u ", highest);
 }
 
-char * 
+char *
 fill_tf_buf(struct test_file *tf)
 {
        if (tf_buf == NULL)
                alloc_tf_buf();
 
-       sprintf(tf_buf,"%u ", tf - test_files);
+       sprintf(tf_buf,"%u ", (int)(tf - test_files));
        return tf_buf;
 }
 
 void
-output_line(struct test_file *tf, int op, unsigned long offset, 
+output_line(struct test_file *tf, int op, unsigned long offset,
                unsigned long size, struct timeval *tv)
 {
        char *tf_num = "";

diff --git a/lustre/tests/recovery-small.sh b/lustre/tests/recovery-small.sh
index 241feec..b79d32d 100755 (executable)
--- a/lustre/tests/recovery-small.sh
+++ b/lustre/tests/recovery-small.sh
@@ -39,7 +39,7 @@ setup() {
     start ost2 --reformat $OSTLCONFARGS 
     [ "$DAEMONFILE" ] && $LCTL debug_daemon start $DAEMONFILE $DAEMONSIZE
     start mds $MDSLCONFARGS --reformat
-    zconf_mount `hostname`  $MOUNT
+    grep " $MOUNT " /proc/mounts || zconf_mount `hostname`  $MOUNT
 }
 
 cleanup() {

diff --git a/lustre/tests/replay-dual.sh b/lustre/tests/replay-dual.sh
index 8e10631..9c1f1e1 100755 (executable)
--- a/lustre/tests/replay-dual.sh
+++ b/lustre/tests/replay-dual.sh
@@ -62,8 +62,8 @@ fi
 start ost2 --reformat $OSTLCONFARGS 
 [ "$DAEMONFILE" ] && $LCTL debug_daemon start $DAEMONFILE $DAEMONSIZE
 start mds $MDSLCONFARGS --reformat
-zconf_mount `hostname` $MOUNT
-zconf_mount `hostname` $MOUNT2
+grep " $MOUNT " /proc/mounts || zconf_mount `hostname` $MOUNT
+grep " $MOUNT2 " /proc/mounts || zconf_mount `hostname` $MOUNT2
 
 echo $TIMEOUT > /proc/sys/lustre/timeout
 echo $UPCALL > /proc/sys/lustre/upcall

diff --git a/lustre/tests/replay-ost-single.sh b/lustre/tests/replay-ost-single.sh
index 4331be5..f1523bb 100755 (executable)
--- a/lustre/tests/replay-ost-single.sh
+++ b/lustre/tests/replay-ost-single.sh
@@ -56,7 +56,7 @@ setup() {
     start ost --reformat $OSTLCONFARGS
     [ "$DAEMONFILE" ] && $LCTL debug_daemon start $DAEMONFILE $DAEMONSIZE
     start mds --reformat $MDSLCONFARGS
-    zconf_mount `hostname` $MOUNT
+    grep " $MOUNT " /proc/mounts || zconf_mount `hostname` $MOUNT
 }
 
 mkdir -p $DIR

diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh
index 5a1dd22..f1fae7a 100755 (executable)
--- a/lustre/tests/replay-single.sh
+++ b/lustre/tests/replay-single.sh
@@ -61,8 +61,8 @@ setup() {
     start ost2 --reformat $OSTLCONFARGS 
     [ "$DAEMONFILE" ] && $LCTL debug_daemon start $DAEMONFILE $DAEMONSIZE
     start mds $MDSLCONFARGS --reformat
-    zconf_mount `hostname` $MOUNT
-    echo 0x3f0410 > /proc/sys/portals/debug
+    grep " $MOUNT " /proc/mounts || zconf_mount `hostname` $MOUNT
+    #echo 0x3f0410 > /proc/sys/portals/debug
 }
 
 $SETUP