From: Nathan Scott <nathans@sgi.com>
Date: Sun, 1 Sep 2002 11:11:13 +0000 (+0000)
Subject: changes for supporting the version 2 log format.
X-Git-Tag: v1.1.0~1061
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=42e823a997b94a495d23cf10efcd8b2645255bae;p=users%2Fhch%2Fxfstests-dev.git

changes for supporting the version 2 log format.
---

diff --git a/018 b/018
index 513013121..1924127c2 100755
--- 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 82b1541eb..e81b7774d 100755
--- 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 591798e24..63fdd43b0 100644
--- 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>
 ----------------------------------------------------------------------------
diff --git a/common.filter b/common.filter
index 20cd862b0..c7d4eea88 100644
--- a/common.filter
+++ b/common.filter
@@ -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+)/) {