From: Zorro Lang <zlang@redhat.com>
Date: Mon, 27 Feb 2017 08:23:03 +0000 (+0800)
Subject: common/xfs: fix unexpected failure on real 4k sector device
X-Git-Tag: v2022.05.01~2153
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=5f9cbd7089fe14f3d4ef9ce6ec08135d09e2e8e0;p=xfstests-dev.git

common/xfs: fix unexpected failure on real 4k sector device

_xfs_mkfs_validation_check() run "$cmd -s size=2s" to be sure if
xfsprogs support stricter input checks. But there's an unexpected
failure on 4k sector device:

  # blockdev --getbsz --getpbsz --getss $dev
  4096
  4096
  4096
  # mkfs.xfs -f -N -d file,name=$tmpfile,size=1g -s size=2s
  illegal sector size 1024; hw sector is 4096
  ....

So change the sector size from '2s' to '8s' to keep away this
failure.

Signed-off-by: Zorro Lang <zlang@redhat.com>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
---

diff --git a/common/xfs b/common/xfs
index 767a4815..4bd8465b 100644
--- a/common/xfs
+++ b/common/xfs
@@ -542,7 +542,7 @@ _xfs_mkfs_validation_check()
 	local tmpfile=`mktemp`
 	local cmd="$MKFS_XFS_PROG -f -N -d file,name=$tmpfile,size=1g"
 
-	$cmd -s size=2s >/dev/null 2>&1
+	$cmd -s size=8s >/dev/null 2>&1
 	local sum=$?
 
 	$cmd -l version=2,su=260k >/dev/null 2>&1