generic/{094,225}: fix argument to _require_file_block_size_equals_fs_block_size

Fix the incorrect parameter being passed to this new predicate.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>

diff --git a/common/rc b/common/rc
index e53d1569eef732d8db9f0b45e0a3c636e1a253d7..919028eff41ce58d96a775e89944d574d225135c 100644 (file)
--- a/common/rc
+++ b/common/rc
@@ -4231,7 +4231,8 @@ _get_block_size()
 }
 
 # Require that the fundamental allocation unit of a file is the same as the
-# filesystem block size.
+# filesystem block size.  The sole parameter must be the root dir of a
+# filesystem.
 _require_file_block_size_equals_fs_block_size()
 {
        local file_alloc_unit="$(_get_file_block_size $1)"

diff --git a/tests/generic/094 b/tests/generic/094
index 8c292473353a18e330a4052b7e7f78048b2efcf9..20ef158e671e3c4ca53f24702c8785763e9f7674 100755 (executable)
--- a/tests/generic/094
+++ b/tests/generic/094
@@ -43,7 +43,7 @@ _require_test_program "fiemap-tester"
 # FIEMAP test doesn't like finding unwritten blocks after it punches out
 # a partial rt extent.
 test "$FSTYP" = "xfs" && \
-       _require_file_block_size_equals_fs_block_size $fiemapfile
+       _require_file_block_size_equals_fs_block_size $SCRATCH_MNT
 
 seed=`date +%s`
 

diff --git a/tests/generic/225 b/tests/generic/225
index fac688dfabca77d30ec9127cd729094e45cca582..1a7963e82c0bd547d4ab174deaabd5bb1a8f110b 100755 (executable)
--- a/tests/generic/225
+++ b/tests/generic/225
@@ -43,7 +43,7 @@ _require_test_program "fiemap-tester"
 # FIEMAP test doesn't like finding unwritten blocks after it punches out
 # a partial rt extent.
 test "$FSTYP" = "xfs" && \
-       _require_file_block_size_equals_fs_block_size $fiemapfile
+       _require_file_block_size_equals_fs_block_size $SCRATCH_MNT
 
 seed=`date +%s`