Change common mkfs filter to fit the new changes.

Merge of master-melb:xfs-cmds:30162a by kenmcd.

  explicitly mention the log version instead of assuming the default, with further filter changes.

diff --git a/096 b/096
index d9dfd488b51672d09a20dac5e44cb8c622cdb119..55a42a353b2b30bf8f446fe5fc12c3e232af8d16 100755 (executable)
--- a/096
+++ b/096
@@ -57,6 +57,7 @@ _mkfs_filter()
        -e 's/blocks=[0-9][0-9]*/blocks=N/' \
        -e 's/agsize=[0-9][0-9]*/agsize=N/' \
        -e 's/agcount=[0-9][0-9]*/agcount=N/' \
+        -e 's/swidth=[0-9][0-9]* blks$/&, unwritten=1/' \
        -e 's/rtextents=[0-9][0-9]*/rtextents=N/' \
        -e 's/meta-data=[^ ]*/meta-data=DEV/' \
         -e 's/ *isize/ isize/' \
@@ -105,9 +106,9 @@ cat >$tmp.seq.params <<EOF
 # same test but get log stripe from data stripe
   -l version=2 -d su=$big_su,sw=1
 # test out data stripe
-  -d su=$big_su,sw=1
+  -l version=1 -d su=$big_su,sw=1
 # test out data stripe the same but using sunit & swidth
-  -d sunit=`expr $big_su / 512`,swidth=`expr $big_su / 512`
+  -l version=1 -d sunit=`expr $big_su / 512`,swidth=`expr $big_su / 512`
 EOF
 
 

diff --git a/096.internal b/096.internal
index e6717d9b7e0ec4c664c121057bafc7a272372cec..e0e1ee4b12ebcc84f520b96dbb1d7d8a1ba82ba8 100644 (file)
--- a/096.internal
+++ b/096.internal
@@ -32,7 +32,7 @@ realtime =REALTIME               extsz=N, blocks=N, rtextents=N
 
 
 # test out data stripe
---- mkfs=-d su=266240,sw=1 ---
+--- mkfs=-l version=1 -d su=266240,sw=1 ---
 meta-data=DEV isize=256    agcount=N, agsize=N blks
 data     =                       bsize=4096   blocks=N, imaxpct=25
          =                       sunit=65     swidth=65 blks, unwritten=1
@@ -43,7 +43,7 @@ realtime =REALTIME               extsz=N, blocks=N, rtextents=N
 
 
 # test out data stripe the same but using sunit & swidth
---- mkfs=-d sunit=520,swidth=520 ---
+--- mkfs=-l version=1 -d sunit=520,swidth=520 ---
 meta-data=DEV isize=256    agcount=N, agsize=N blks
 data     =                       bsize=4096   blocks=N, imaxpct=25
          =                       sunit=65     swidth=65 blks, unwritten=1

diff --git a/common.filter b/common.filter
index 199b0c456527c87b2229611ba0c0160f2fb2b830..d1d4cb5112a25215d3f566b4f946e31a74907352 100644 (file)
--- a/common.filter
+++ b/common.filter
@@ -131,8 +131,8 @@ _filter_mkfs()
        print STDERR "dbsize=$1\ndblocks=$2\nimaxpct=$3\n";
        print STDOUT "data     = bsize=XXX blocks=XXX, imaxpct=PCT\n";
     }
-    if (/^\s+=\s+sunit=(\d+)\s+swidth=(\d+) blks, unwritten=(\d)/) {
-       print STDERR "sunit=$1\nswidth=$2\nunwritten=$3\n";
+    if (/^\s+=\s+sunit=(\d+)\s+swidth=(\d+) blks/) {
+        print STDERR "sunit=$1\nswidth=$2\nunwritten=1\n";
        print STDOUT "         = sunit=XXX swidth=XXX, unwritten=X\n";
     }
     if (/^naming\s+=version\s+(\d+)\s+bsize=(\d+)/) {