From: Nathan Scott Date: Mon, 28 Aug 2006 06:07:58 +0000 (+0000) Subject: Fix filter on realtime extsize. X-Git-Tag: v1.1.0~589 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=606039ca2781bbb8e15c19ef57628d16c9199819;p=xfstests-dev.git Fix filter on realtime extsize. Merge of master-melb:xfs-cmds:26875a by kenmcd. --- diff --git a/096 b/096 index e890f5f6..d9dfd488 100755 --- a/096 +++ b/096 @@ -53,7 +53,7 @@ _mkfs_filter() { tee -a $seq.full | \ sed \ - -e 's/extsz=[0-9][0-9]*/extsz=N /' \ + -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 2cd9aa1f..7d68373f 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=N 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=N 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=N 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=N blocks=N, rtextents=N +realtime =REALTIME extsz=N, blocks=N, rtextents=N diff --git a/096.internal b/096.internal index 59594802..e6717d9b 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=N 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=N 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=N 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=N blocks=N, rtextents=N +realtime =REALTIME extsz=N, blocks=N, rtextents=N