[PATCH] xfs/032: avoid making a 512b block size V5 xfs

[Date Prev] [Date Next] [Thread Prev] [Thread Next] [Date Index] [Thread Index]



If test on a 512b sector size device, xfs/032 will try to do:

  mkfs.xfs -s size=512 -b size=512 ...

The 512b block size is not acceptable for V5 XFS. So I change the
minimum block size to 1024 if (crc = 1 && sector size < 1024).

Signed-off-by: Zorro Lang <zlang@xxxxxxxxxx>
---
 tests/xfs/032 | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/tests/xfs/032 b/tests/xfs/032
index 6216379..487dbd9 100755
--- a/tests/xfs/032
+++ b/tests/xfs/032
@@ -34,6 +34,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
 . ./common/rc
+. ./common/filter
 
 # real QA test starts here
 _supported_fs xfs
@@ -50,11 +51,22 @@ rm -f $seqres.full
 SECTORSIZE=`blockdev --getss $SCRATCH_DEV`
 PAGESIZE=`src/feature -s`
 IMGFILE=$TEST_DIR/${seq}_copy.img
+MIN_BLKSIZE=$SECTORSIZE
+
+if [ $MIN_BLKSIZE -lt 1024 ]; then
+	_scratch_mkfs_sized $((512 * 1024 * 1024)) | _filter_mkfs \
+						2>$tmp.mkfs >/dev/null
+	. $tmp.mkfs
+	if [ $_fs_has_crcs -eq 1 ]; then
+		MIN_BLKSIZE=1024
+	fi
+	rm -f $tmp.mkfs
+fi
 
 echo "Silence is golden."
 
 while [ $SECTORSIZE -le $PAGESIZE ]; do
-	BLOCKSIZE=$SECTORSIZE;
+	BLOCKSIZE=$MIN_BLKSIZE;
 
 	while [ $BLOCKSIZE -le $PAGESIZE ]; do
 
-- 
2.7.4

--
To unsubscribe from this list: send the line "unsubscribe fstests" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux Filesystems Development]     [Linux NFS]     [Linux NILFS]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux