Improve filtering to handle different realtime extent sizes too.

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

diff --git a/096 b/096
index 91f02ad5c03685731751e3a14e955c87c49ba706..e890f5f680df46cec081889419ba9d9d1db51c1d 100755 (executable)
--- a/096
+++ b/096
@@ -32,7 +32,7 @@ _cleanup()
 
 #
 # filter out counts which will vary
-#   - blocks, agsize, agcount, device name
+#   - extsz, blocks, agsize, agcount, device name, rtextents
 # filter out differences between linux and irix:
 #   - sectsz on Linux
 #   - mmr, mixed-case on IRIX
@@ -53,6 +53,7 @@ _mkfs_filter()
 {
    tee -a $seq.full | \
    sed \
+       -e 's/extsz=[0-9][0-9]*/extsz=N   /' \
        -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/' \

diff --git a/096.external b/096.external
index 189b53af9c24766633cb71346ba60b4a932fc582..2cd9aa1f8fb607e3cf4832f7e053121365ef04f9 100644 (file)
--- a/096.external
+++ b/096.external
@@ -15,7 +15,7 @@ data     =                       bsize=4096   blocks=N, imaxpct=25
 naming   =version 2              bsize=4096
 log      =LOG                    bsize=4096   blocks=N, version=2
          =                       sunit=8 blks
-realtime =REALTIME               extsz=65536  blocks=N, rtextents=N
+realtime =REALTIME               extsz=N      blocks=N, rtextents=N
 
 
 # same test but get log stripe from data stripe
@@ -26,7 +26,7 @@ data     =                       bsize=4096   blocks=N, imaxpct=25
 naming   =version 2              bsize=4096
 log      =LOG                    bsize=4096   blocks=N, version=2
          =                       sunit=0 blks
-realtime =REALTIME               extsz=65536  blocks=N, rtextents=N
+realtime =REALTIME               extsz=N      blocks=N, rtextents=N
 
 
 # test out data stripe
@@ -37,7 +37,7 @@ data     =                       bsize=4096   blocks=N, imaxpct=25
 naming   =version 2              bsize=4096
 log      =LOG                    bsize=4096   blocks=N, version=1
          =                       sunit=0 blks
-realtime =REALTIME               extsz=65536  blocks=N, rtextents=N
+realtime =REALTIME               extsz=N      blocks=N, rtextents=N
 
 
 # test out data stripe the same but using sunit & swidth
@@ -48,6 +48,6 @@ data     =                       bsize=4096   blocks=N, imaxpct=25
 naming   =version 2              bsize=4096
 log      =LOG                    bsize=4096   blocks=N, version=1
          =                       sunit=0 blks
-realtime =REALTIME               extsz=65536  blocks=N, rtextents=N
+realtime =REALTIME               extsz=N      blocks=N, rtextents=N
 
 

diff --git a/096.internal b/096.internal
index f4dcec3b925ecf3a82d88fb668d205657e780f94..5959480201c8c41eddf1f16b7df927efb6449f9e 100644 (file)
--- a/096.internal
+++ b/096.internal
@@ -15,7 +15,7 @@ data     =                       bsize=4096   blocks=N, imaxpct=25
 naming   =version 2              bsize=4096
 log      =LOG                    bsize=4096   blocks=N, version=2
          =                       sunit=8 blks
-realtime =REALTIME               extsz=65536  blocks=N, rtextents=N
+realtime =REALTIME               extsz=N      blocks=N, rtextents=N
 
 
 # same test but get log stripe from data stripe
@@ -28,7 +28,7 @@ data     =                       bsize=4096   blocks=N, imaxpct=25
 naming   =version 2              bsize=4096
 log      =LOG                    bsize=4096   blocks=N, version=2
          =                       sunit=8 blks
-realtime =REALTIME               extsz=65536  blocks=N, rtextents=N
+realtime =REALTIME               extsz=N      blocks=N, rtextents=N
 
 
 # test out data stripe
@@ -39,7 +39,7 @@ data     =                       bsize=4096   blocks=N, imaxpct=25
 naming   =version 2              bsize=4096
 log      =LOG                    bsize=4096   blocks=N, version=1
          =                       sunit=0 blks
-realtime =REALTIME               extsz=65536  blocks=N, rtextents=N
+realtime =REALTIME               extsz=N      blocks=N, rtextents=N
 
 
 # test out data stripe the same but using sunit & swidth
@@ -50,6 +50,6 @@ data     =                       bsize=4096   blocks=N, imaxpct=25
 naming   =version 2              bsize=4096
 log      =LOG                    bsize=4096   blocks=N, version=1
          =                       sunit=0 blks
-realtime =REALTIME               extsz=65536  blocks=N, rtextents=N
+realtime =REALTIME               extsz=N      blocks=N, rtextents=N