From: Chandan Rajendra <chandan@linux.vnet.ibm.com>
To: fstests@vger.kernel.org
Cc: Chandan Rajendra <chandan@linux.vnet.ibm.com>,
eguan@redhat.com, darrick.wong@oracle.com,
linux-xfs@vger.kernel.org
Subject: [PATCH V2 08/16] Fix xfs/190 to work with 64k block size
Date: Thu, 6 Sep 2018 14:10:05 +0530 [thread overview]
Message-ID: <20180906084013.2687-9-chandan@linux.vnet.ibm.com> (raw)
In-Reply-To: <20180906084013.2687-1-chandan@linux.vnet.ibm.com>
This commit describes "file hole" ranges in multiples of block sizes
rather than using constants.
Signed-off-by: Chandan Rajendra <chandan@linux.vnet.ibm.com>
---
tests/xfs/190 | 26 +++++++++++++++++---------
1 file changed, 17 insertions(+), 9 deletions(-)
diff --git a/tests/xfs/190 b/tests/xfs/190
index 3275e29..53dad06 100755
--- a/tests/xfs/190
+++ b/tests/xfs/190
@@ -10,13 +10,6 @@
#
# PV 985792
#
-#This is the list of holes to punch in the file limited to $filesize
-#NOTE holes cannot overlap or this script will fail.
-holes="4096:4096 303104:4096 1048576:512 1051648:8192 1065984:8192 1085440:7168"
-#filesize in MB
-filesize=10
-#Name of file to perform the test on
-filename=test-190
seq=`basename $0`
seqres=$RESULT_DIR/$seq
@@ -38,9 +31,24 @@ _supported_os Linux
_require_scratch
_scratch_mkfs_xfs >/dev/null 2>&1
_scratch_mount
-fsblocksize=`$XFS_INFO_PROG $SCRATCH_MNT|sed 's/=/ /g'|awk '/^data / { print $3 }'`
-dd if=/dev/zero of=$SCRATCH_MNT/$filename bs=1024k count=10 >> $seqres.full 2>&1
+fsblocksize=$(_get_block_size $SCRATCH_MNT)
+
+#This is the list of holes to punch in the file limited to $filesize
+#NOTE holes cannot overlap or this script will fail.
+holes="$fsblocksize:$fsblocksize \
+$(($fsblocksize * 74)):$fsblocksize \
+$(($fsblocksize * 256)):$(($fsblocksize / 8)) \
+$(echo scale=0\;$fsblocksize \* 256 \+ $fsblocksize \* 3 \/ 4 | bc):$(($fsblocksize * 2)) \
+$(echo scale=0\;$fsblocksize \* 260 \+ $fsblocksize \* 1 \/ 4 | bc):$(($fsblocksize * 2)) \
+$(($fsblocksize * 265)):$(echo scale=0\;$fsblocksize \+ $fsblocksize \* 3 \/ 4 | bc)"
+
+#filesize
+filesize=$(($fsblocksize * 2560))
+#Name of file to perform the test on
+filename=test-190
+
+$XFS_IO_PROG -f -c "pwrite 0 $(($fsblocksize * 2560))" $SCRATCH_MNT/$filename >> $seqres.full 2>&1
# run DMAPI test using verbose output
echo Punching holes in file
--
2.9.5
next prev parent reply other threads:[~2018-09-06 13:12 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-06 8:39 [PATCH V2 00/16] Fix tests to work on non-4k block sized fs instances Chandan Rajendra
2018-09-06 8:39 ` [PATCH V2 01/16] Fix xfs/009 to work with 64k block size Chandan Rajendra
2018-09-06 8:39 ` [PATCH V2 02/16] xfs/050: Fix "Push past soft inode limit" case Chandan Rajendra
2018-09-06 8:40 ` [PATCH V2 03/16] Fix xfs/050 to work with 64k block size Chandan Rajendra
2018-09-06 8:40 ` [PATCH V2 04/16] Fix xfs/074 " Chandan Rajendra
2018-09-06 8:40 ` [PATCH V2 05/16] Fix xfs/127 " Chandan Rajendra
2018-09-06 8:40 ` [PATCH V2 06/16] Fix xfs/139 " Chandan Rajendra
2018-09-06 8:40 ` [PATCH V2 07/16] Fix xfs/140 " Chandan Rajendra
2018-09-06 8:40 ` Chandan Rajendra [this message]
2018-09-06 8:40 ` [PATCH V2 09/16] Fix xfs/299 " Chandan Rajendra
2018-09-06 8:40 ` [PATCH V2 10/16] xfs/325: Inject free_extent error after CoW operation Chandan Rajendra
2018-09-06 8:40 ` [PATCH V2 11/16] Fix generic/102 to work with 64k block size Chandan Rajendra
2018-09-06 8:40 ` [PATCH V2 12/16] Fix generic/172 " Chandan Rajendra
2018-09-06 8:40 ` [PATCH V2 13/16] Filter fiemap output by FS " Chandan Rajendra
2018-09-06 8:40 ` [PATCH V2 14/16] Fix generic/177 to work with 64k " Chandan Rajendra
2018-09-06 8:40 ` [PATCH V2 15/16] Fix generic/230 " Chandan Rajendra
2018-09-06 8:40 ` [PATCH V2 16/16] Fix generic/235 " Chandan Rajendra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180906084013.2687-9-chandan@linux.vnet.ibm.com \
--to=chandan@linux.vnet.ibm.com \
--cc=darrick.wong@oracle.com \
--cc=eguan@redhat.com \
--cc=fstests@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).