From e5aa6888b6c53dc85630d3ce41f988c02193e215 Mon Sep 17 00:00:00 2001 From: Zorro Lang Date: Mon, 21 Sep 2015 13:06:17 +1000 Subject: [PATCH] xfs/194: fix the exception when run on 4k sector drives The below command in "Test 4": xfs_io -c "pwrite -S 0x33 -b 512 `expr $blksize \* 2` 512" will run failed on 4k sector drives. So I use sector size to replace the hard-code 512. And we won't run this case when $sector_size > $page_size / 8. Signed-off-by: Zorro Lang Reviewed-by: Dave Chinner Signed-off-by: Dave Chinner --- tests/xfs/194 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/xfs/194 b/tests/xfs/194 index e11b459e..e9e85889 100755 --- a/tests/xfs/194 +++ b/tests/xfs/194 @@ -50,6 +50,11 @@ rm -f $seqres.full # For this test we use block size = 1/8 page size pgsize=`$here/src/feature -s` blksize=`expr $pgsize / 8` +secsize=`_min_dio_alignment $SCRATCH_DEV` + +if [ $secsize -gt $blksize ];then + _notrun "sector size($secsize) too large for platform page size($pgsize)" +fi # Filter out file mountpoint and physical location info # Input: @@ -209,7 +214,7 @@ xfs_io \ -c "truncate `expr $blksize / 2`" \ -c "truncate `expr $blksize + 1`" \ -c "pwrite -S 0x22 -b $blksize `expr $pgsize / 2` $blksize" \ --c "pwrite -S 0x33 -b 512 `expr $blksize \* 2` 512" \ +-c "pwrite -S 0x33 -b $secsize `expr $blksize \* 2` $secsize" \ -t -d -f $SCRATCH_MNT/testfile4 >> $seqres.full xfs_bmap -v $SCRATCH_MNT/testfile4 | _filter_bmap -- 2.39.5