simple change to make this work for v2 logs - should be revisited. loggen
authorfsgqa <fsgqa>
Sun, 1 Sep 2002 11:48:05 +0000 (11:48 +0000)
committerfsgqa <fsgqa>
Sun, 1 Sep 2002 11:48:05 +0000 (11:48 +0000)
tool needs real v2 log support...

044
common.filter

diff --git a/044 b/044
index 8e47bd78fa17c3f112499057003e4c87d89ed3b4..36f8ae94474c9da2bf85b88c608aac5a38a206fd 100755 (executable)
--- a/044
+++ b/044
@@ -2,7 +2,7 @@
 # XFS QA Test No. 044
 # $Id: 1.1 $
 #
-# external log uuid/format tests
+# external log uuid/format tests (TODO - version 2 log format)
 #
 #-----------------------------------------------------------------------
 # Copyright (c) 2000-2002 Silicon Graphics, Inc.  All Rights Reserved.
@@ -125,9 +125,11 @@ _require_scratch
 echo -e -n "\n\r*** XFS QA 044 - expect mount failure messages\n\r\n\r" >/dev/console
 
 echo "*** mkfs"
+lversion=1
 lsize=16777216
 ldev=$SCRATCH_LOGDEV
-mkfs_xfs -llogdev=$ldev,size=$lsize $SCRATCH_DEV | _filter_mkfs 2>/dev/null
+logopts="-llogdev=$ldev,size=$lsize,version=$lversion"
+mkfs_xfs $logopts $SCRATCH_DEV | _filter_mkfs 2>/dev/null
 _check_mount
 _check_require_logdev
 
index c7d4eea8846a3ba9dc6db96ff046deba74c95bdd..2b73253aa607e28c93e16aa99647431dcdd91072 100644 (file)
@@ -166,7 +166,7 @@ _filter_mkfs()
        print STDERR "dirversion=$1\ndirbsize=$2\n";
        print STDOUT "naming   =VERN bsize=XXX\n";
     }
-    if (/^log\s+=(internal log|[\w|\/.-]+)\s+bsize=(\d+)\s+blocks=(\d+)\s+version=(\d+)/) {
+    if (/^log\s+=(internal log|[\w|\/.-]+)\s+bsize=(\d+)\s+blocks=(\d+),\s+version=(\d+)/) {
        print STDERR "ldev=\"$1\"\nlbsize=$2\nlblocks=$3\nlversion=$4";
        print STDOUT "log      =LDEV bsize=XXX blocks=XXX\n";
     }