Rename the function because we need both xfs_io and kernel support for
the check, and we need xfs_io support to check for kernel support.
Signed-off-by: Junho Ryu <jayr@xxxxxxxxxx>
---
v2: new patch
common/defrag | 2 +-
common/rc | 2 +-
tests/generic/255 | 2 +-
tests/generic/316 | 2 +-
tests/shared/298 | 2 +-
tests/xfs/252 | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/common/defrag b/common/defrag
index a4bc976..81b58e7 100644
--- a/common/defrag
+++ b/common/defrag
@@ -38,7 +38,7 @@ _require_defrag()
esac
_require_command $DEFRAG_PROG
- _require_xfs_io_fiemap
+ _require_fiemap
}
_extent_count()
diff --git a/common/rc b/common/rc
index 45a45b0..1db313b 100644
--- a/common/rc
+++ b/common/rc
@@ -1281,7 +1281,7 @@ _require_xfs_io_falloc_punch()
}
# check that xfs_io, kernel and filesystem support fiemap
-_require_xfs_io_fiemap()
+_require_fiemap()
{
testfile=$TEST_DIR/$$.fiemap
testio=`$XFS_IO_PROG -F -f -c "pwrite 0 20k" -c "fsync" \
diff --git a/tests/generic/255 b/tests/generic/255
index dd329b4..739629c 100755
--- a/tests/generic/255
+++ b/tests/generic/255
@@ -48,7 +48,7 @@ _supported_os Linux
_require_xfs_io_falloc_punch
_require_xfs_io_falloc
-_require_xfs_io_fiemap
+_require_fiemap
testfile=$TEST_DIR/255.$$
diff --git a/tests/generic/316 b/tests/generic/316
index 8cb2975..4bb6c4a 100755
--- a/tests/generic/316
+++ b/tests/generic/316
@@ -46,7 +46,7 @@ _supported_fs generic
_supported_os Linux
_require_xfs_io_falloc_punch
-_require_xfs_io_fiemap
+_require_fiemap
testfile=$TEST_DIR/$seq.$$
diff --git a/tests/shared/298 b/tests/shared/298
index 4541798..e8c3d48 100755
--- a/tests/shared/298
+++ b/tests/shared/298
@@ -33,7 +33,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fs ext4 xfs
_supported_os Linux
_require_fstrim
-_require_xfs_io_fiemap
+_require_fiemap
_require_fs_space $TEST_DIR 307200
[ "$FSTYP" = "ext4" ] && _require_dumpe2fs
diff --git a/tests/xfs/252 b/tests/xfs/252
index 00be41a..1a5133e 100755
--- a/tests/xfs/252
+++ b/tests/xfs/252
@@ -47,7 +47,7 @@ _supported_fs xfs
_supported_os Linux
_require_xfs_io_falloc_punch
-_require_xfs_io_fiemap
+_require_fiemap
testfile=$TEST_DIR/252.$$
--
1.8.5.1
_______________________________________________
xfs mailing list
xfs@xxxxxxxxxxx
http://oss.sgi.com/mailman/listinfo/xfs
