From 770e158a6b75a9b10e13595094cf44630bd55be0 Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Tue, 22 Aug 2006 03:55:04 +0000 Subject: [PATCH] Improve filtering to handle different realtime extent sizes too. Merge of master-melb:xfs-cmds:26834a by kenmcd. --- 096 | 3 ++- 096.external | 8 ++++---- 096.internal | 8 ++++---- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/096 b/096 index 91f02ad5..e890f5f6 100755 --- 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 189b53af..2cd9aa1f 100644 --- 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 f4dcec3b..59594802 100644 --- 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 -- 2.39.5