Allow for use of an external log device in benchmarks.

bench

@@ -87,6 +87,16 @@ _fail()
     exit 1
 }
 
+bench_mkfs_xfs()
+{
+    mkfs_xfs -f $extra_mkfs_options $@
+}
+
+bench_mount_xfs()
+{
+    mount -t xfs $extra_mount_options $@
+}
+
 _run_benchmark()
 {
     pass=1
@@ -96,11 +106,11 @@ _run_benchmark()
     while [ $pass -le $passes -o $passes -lt 0 ]
     do
         _log "        *** clean scratch device [$bench starting, pass $pass]"
-        mkfs_xfs -f $SCRATCH_DEV 2>&1 |  _fix_malloc >>$FULL \
+        bench_mkfs_xfs  $SCRATCH_DEV 2>&1 | _fix_malloc >>$FULL \
                             || _fail "            !!! mkfs SCRATCH_DEV failed"
 
         _log "        *** mounting scratch device"
-        mount -t xfs $SCRATCH_DEV $SCRATCH_MNT \
+        bench_mount_xfs $SCRATCH_DEV $SCRATCH_MNT \
                             || _fail "            !!! failed to mount"
         
         _log "        *** mkdir"
@@ -164,10 +174,17 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _require_scratch
 rm -f bench.* results.*
 
+if [ ! -z "$SCRATCH_LOGDEV" -a ! -z "$USE_SCRATCH_LOGDEV" ]
+then
+	extra_log_options="-l $SCRATCH_LOGDEV"
+	extra_mkfs_options="-llogdev=$SCRATCH_LOGDEV"
+	extra_mount_options="-ologdev=$SCRATCH_LOGDEV"
+fi
+
 # $OUT is the report which will ultimately be sent, keep it tidy.
 cat >$OUT <<EOF
-bench: MKFS_OPTIONS=$MKFS_OPTIONS
-bench: MOUNT_OPTIONS=$MOUNT_OPTIONS
+bench: MKFS_OPTIONS=$MKFS_OPTIONS $extra_mkfs_options
+bench: MOUNT_OPTIONS=$MOUNT_OPTIONS $extra_mount_options
 
 EOF
 

common.rc

@@ -503,7 +503,8 @@ _check_fs()
         fi
     fi
 
-    xfs_logprint -t $device 2>&1 | tee $tmp.fs_check | grep -q "<CLEAN>"
+    xfs_logprint -t $device $extra_log_options 2>&1 \
+                | tee $tmp.fs_check | grep -q "<CLEAN>"
     if [ $? -ne 0 ]
     then
         echo "_check_fs: filesystem on $device has dirty log (see $seq.full)"
@@ -516,7 +517,6 @@ _check_fs()
         ok=0
     fi
         
-    
     xfs_check $device 2>&1 | _fix_malloc >$tmp.fs_check 
     if [ -s $tmp.fs_check ]
     then
@@ -530,7 +530,7 @@ _check_fs()
         ok=0
     fi
     
-    if ! xfs_repair -n $device >$tmp.fs_check 2>&1
+    if ! xfs_repair -n $device $extra_log_options >$tmp.fs_check 2>&1
     then
         echo "_check_fs: filesystem on $device is inconsistent (r) (see $seq.full)"