[PATCH 02/28] _scratch_mkfs_sized: obey USE_EXTERNAL for XFS filesystems

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



From: Dave Chinner <dchinner@xxxxxxxxxxx>

_scratch_mkfs_sized is failing on my check-parallel setup because it
has an RTDEV defined but USE_EXTERNAL is not set.  Hence
_scratch_mkfs_sized sees the RTDEV, adds a size parameter for it,
then passes that to _try_scratch_mkfs_xfs() which looks at
USE_EXTERNAL and so doesn't add a RTDEV to the filesystem.

The result is that _scratch_mkfs_sized -always- fails with this sort
of error:

.....
** mkfs failed with extra mkfs options added to "-m rmapbt=1 -i exchange=1 " by test 300 **
** attempting to mkfs using only test 300 options: -d size=536870912 -r size=536870912 -b size=4096 **
size specified for non-existent rt subvolume
Usage: mkfs.xfs
.....

Make the XFS code in _scratch_mkfs_sized look at USE_EXTERNAL like
the ext4 code does.

Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx>
---
 common/rc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/rc b/common/rc
index 9bed6dad9..12a05cb96 100644
--- a/common/rc
+++ b/common/rc
@@ -1264,7 +1264,7 @@ _try_scratch_mkfs_sized()
 	xfs)
 		local rt_ops
 
-		if [ -b "$SCRATCH_RTDEV" ]; then
+		if [ "$USE_EXTERNAL" = yes -a -b "$SCRATCH_RTDEV" ]; then
 			local rtdevsize=`blockdev --getsize64 $SCRATCH_RTDEV`
 			if [ "$fssize" -gt "$rtdevsize" ]; then
 				_notrun "Scratch rt device too small"
-- 
2.45.2





[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