Fix test 096 when used with realtime subvols.

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

diff --git a/096 b/096
index 6491eab5ec43e1e72bc2230d56ce6e96998deecb..55c6a6170ecfbb7c460e129efc8c9850034875a2 100755 (executable)
--- a/096
+++ b/096
@@ -47,7 +47,7 @@ _cleanup()
 #  naming   =version 2              bsize=4096
 #  log      =internal log           bsize=4096   blocks=N, version=1
 #           =                       sunit=0 blks
-#  realtime =none                   extsz=65536  blocks=N, rtextents=0
+#  realtime =none                   extsz=65536  blocks=N, rtextents=N
 #
 _mkfs_filter()
 {
@@ -56,6 +56,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/rtextents=[0-9][0-9]*/rtextents=N/' \
        -e 's/meta-data=[^ ]*/meta-data=DEV/' \
         -e 's/ *isize/ isize/' \
        -e '/ *= *sectsz=[0-9][0-9]* *attr=[0-9][0-9]*$/d' \

diff --git a/096.external b/096.external
index 51ed8edfa1a60685e225d14ab4f697ddedb46092..cdb43401e6cd317e667698887d7484bb0ead1594 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 =none                   extsz=65536  blocks=N, rtextents=0
+realtime =none                   extsz=65536  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 =none                   extsz=65536  blocks=N, rtextents=0
+realtime =none                   extsz=65536  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 =none                   extsz=65536  blocks=N, rtextents=0
+realtime =none                   extsz=65536  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 =none                   extsz=65536  blocks=N, rtextents=0
+realtime =none                   extsz=65536  blocks=N, rtextents=N
 
 

diff --git a/096.internal b/096.internal
index 5d091feebac7f2765789d68b7598f07fe03100a5..861c0788a0b49ccddf0d13d29378f590856b7deb 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 =none                   extsz=65536  blocks=N, rtextents=0
+realtime =none                   extsz=65536  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 =none                   extsz=65536  blocks=N, rtextents=0
+realtime =none                   extsz=65536  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 =none                   extsz=65536  blocks=N, rtextents=0
+realtime =none                   extsz=65536  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 =none                   extsz=65536  blocks=N, rtextents=0
+realtime =none                   extsz=65536  blocks=N, rtextents=N