changes for supporting the version 2 log format.
authorNathan Scott <nathans@sgi.com>
Sun, 1 Sep 2002 11:11:13 +0000 (11:11 +0000)
committerNathan Scott <nathans@sgi.com>
Sun, 1 Sep 2002 11:11:13 +0000 (11:11 +0000)
018
029
029.out
common.filter

diff --git a/018 b/018
index 513013121a90c7621ab588260f7d36c2de2c82cc..1924127c26f1a2c3375e5f7614d0793691a4f430 100755 (executable)
--- a/018
+++ b/018
@@ -126,6 +126,8 @@ mkfs_xfs -lsize=2000b $SCRATCH_DEV | _filter_mkfs 2>$tmp.mkfs
 source $tmp.mkfs
 [ $dbsize -eq 4096 ] \
     || _notrun "Logprint test, tailored to 4K blocks ($dbsize in use)"
+[ $lversion -eq 1 ] \
+    || _notrun "Logprint test, tailored to version 1 log format"
 
 rm -f $seq.out $seq.full
 
diff --git a/029 b/029
index 82b1541eb9538fbb33ed958afa15c640923a2ae4..e81b7774db5dc06204cad9871d0f980353ddfc4f 100755 (executable)
--- a/029
+++ b/029
@@ -68,6 +68,7 @@ _filter_logprint()
            s/log file: "([\w|\/.-]+)" daddr: (\d+) length: (\d+)/log device: LDEV daddr: XXX length: XXX/;
            s/skipped (\w+) zeroed blocks/skipped XXX zeroed blocks/;
             s/^uuid: *[0-9a-f-][0-9a-f-]* *format: *.*$/uuid: <UUID> format: <FORMAT>/;
+            s/version: \d/version: <VERN>/;
            print;
        '
 }
diff --git a/029.out b/029.out
index 591798e244311dc3c78a1dc6738946afcd03f12d..63fdd43b0e04a5121d9909e2e3c81bae7bd4dc22 100644 (file)
--- a/029.out
+++ b/029.out
@@ -11,7 +11,7 @@ xfs_logprint:
     data device: DDEV
     log device: LDEV daddr: XXX length: XXX
 
-cycle: 1       version: 1              lsn: 1,0        tail_lsn: 1,0
+cycle: 1       version: <VERN>         lsn: 1,0        tail_lsn: 1,0
 length of Log Record: 20       prev offset: -1         num ops: 1
 uuid: <UUID> format: <FORMAT>
 ----------------------------------------------------------------------------
index 20cd862b0e54596631eb7d679e9766671d7c410f..c7d4eea8846a3ba9dc6db96ff046deba74c95bdd 100644 (file)
@@ -166,8 +166,8 @@ _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+)/) {
-       print STDERR "ldev=\"$1\"\nlbsize=$2\nlblocks=$3\n";
+    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";
     }
     if (/^realtime\s+=([\w|\/.-]+)\s+extsz=(\d+)\s+blocks=(\d+), rtextents=(\d+)/) {