mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
Fix coupel of newer tests to work with external log/rt devices too.
Merge of master-melb:xfs-cmds:26371a by kenmcd.
This commit is contained in:
@@ -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
|
||||
}
|
||||
|
||||
+4
-4
@@ -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
|
||||
|
||||
|
||||
|
||||
+4
-4
@@ -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
|
||||
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user