From e48c1f054f3fa2930c65432ac97fd69434c7fd99 Mon Sep 17 00:00:00 2001 From: "Darrick J. Wong" Date: Tue, 27 Apr 2021 21:09:06 -0700 Subject: [PATCH] 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 Reviewed-by: Brian Foster Signed-off-by: Eryu Guan --- common/rc | 3 ++- tests/generic/094 | 2 +- tests/generic/225 | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/common/rc b/common/rc index e53d1569..919028ef 100644 --- 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 8c292473..20ef158e 100755 --- 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 fac688df..1a7963e8 100755 --- 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` -- 2.30.2