From 97a665b5fc3487e86443e507244cc5fb1a08550c Mon Sep 17 00:00:00 2001 From: Dave Chinner Date: Thu, 13 Mar 2014 14:58:16 +1100 Subject: [PATCH] xfs/189: noattr2 invalid for CRC enabled filesystems Version 5 filesystems always have attr2 format enabled, and it cannot be turned off via the noattr2 mount option. As such, attempts to mount with noattr2 will be rejected and this causes cascading failures within the test. Hence detect if we've created a CRC enabled filesystem, and if this is the case _notrun the test. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig Signed-off-by: Dave Chinner --- common/attr | 10 ++++++++++ tests/xfs/189 | 2 ++ 2 files changed, 12 insertions(+) diff --git a/common/attr b/common/attr index 1f3e57f4..83bf9d14 100644 --- a/common/attr +++ b/common/attr @@ -196,6 +196,16 @@ _require_attr_v1() || _notrun "attr v1 not supported on $SCRATCH_DEV" } +# check if we support the noattr2 mount option +_require_noattr2() +{ + _scratch_mkfs_xfs > /dev/null 2>&1 \ + || _fail "_scratch_mkfs_xfs failed on $SCRATCH_DEV" + _mount -o noattr2 $SCRATCH_DEV > /dev/null 2>&1 \ + || _notrun "noattr2 mount option not supported on $SCRATCH_DEV" + _scratch_unmount +} + # getfattr -R returns info in readdir order which varies from fs to fs. # This sorts the output by filename _sort_getfattr_output() diff --git a/tests/xfs/189 b/tests/xfs/189 index 27bfb63e..a56bbdec 100755 --- a/tests/xfs/189 +++ b/tests/xfs/189 @@ -230,6 +230,7 @@ _putback_scratch_fstab() # get standard environment, filters and checks . ./common/rc . ./common/filter +. ./common/attr # real QA test starts here _supported_fs xfs @@ -237,6 +238,7 @@ _supported_os Linux _need_to_be_root _require_scratch +_require_noattr2 unset SCRATCH_RTDEV unset SCRATCH_LOGDEV -- 2.47.3