Fix coupel of newer tests to work with external log/rt devices too.

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

diff --git a/096 b/096
index 55c6a6170ecfbb7c460e129efc8c9850034875a2..91f02ad5c03685731751e3a14e955c87c49ba706 100755 (executable)
--- a/096
+++ b/096
@@ -66,6 +66,7 @@ _mkfs_filter()
        -e 's/, lazy-count.*//' \
        -e '/inode-paths/d' \
        -e 's/\(log[    ]*=\).*bsize/\1LOG                    bsize/' \
+       -e 's/\(realtime[       ]*=\).*extsz/\1REALTIME               extsz/' \
        -e 's/ *$//' \
    | grep -v parent
 }

diff --git a/096.external b/096.external
index cdb43401e6cd317e667698887d7484bb0ead1594..189b53af9c24766633cb71346ba60b4a932fc582 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=N
+realtime =REALTIME               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=N
+realtime =REALTIME               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=N
+realtime =REALTIME               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=N
+realtime =REALTIME               extsz=65536  blocks=N, rtextents=N
 
 

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

diff --git a/121 b/121
index cfc6386f334f2cdcb3889df887aecd089a5de7bc..ba824696355b184f314d018e87ea6d50d7972b5e 100755 (executable)
--- a/121
+++ b/121
@@ -4,7 +4,7 @@
 # To test log replay for the unlinked list.
 # So we create unlinked and still referenced inodes
 # and make sure that no clearing of the unlinked AGI buckets
-# are happening. 
+# are happening.
 # See pv#953263.
 #
 #-----------------------------------------------------------------------
@@ -46,7 +46,7 @@ _scratch_mount >>$seq.full 2>&1 \
 
 # num_files must be greater than 64 (XFS_AGI_UNLINKED_BUCKETS)
 # so that there will be at least one linked list from one of
-# the 64 buckets, so that we can decode a di_next_unlinked field 
+# the 64 buckets, so that we can decode a di_next_unlinked field
 num_files=200
 delay=5
 echo "open and unlink $num_files files"
@@ -82,7 +82,7 @@ echo "logprint after going down..."
 _print_logstate
 
 echo "logprint to check for CLEAR_AGI_BUCKET..."
-xfs_logprint -t $SCRATCH_DEV | grep CLEAR
+_scratch_xfs_logprint -t | grep CLEAR
 
 # success, all done
 status=0