On Thu, Nov 21, 2024 at 10:39:10AM +0530, Nirjhar Roy wrote:
> This patch defines a common helper function to test whether any of
> fsxattr xflags field is set or not. We will use this helper in
> an upcoming patch for checking extsize (e) flag.
>
> Reviewed-by: Ritesh Harjani (IBM) <ritesh.list@xxxxxxxxx>
> Reviewed-by: Ojaswin Mujoo <ojaswin@xxxxxxxxxxxxx>
> Signed-off-by: Nirjhar Roy <nirjhar@xxxxxxxxxxxxx>
Looks good to me now,
Reviewed-by: "Darrick J. Wong" <djwong@xxxxxxxxxx>
--D
> ---
> common/rc | 7 +++++++
> tests/xfs/207 | 15 ++++-----------
> 2 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/common/rc b/common/rc
> index 2af26f23..cccc98f5 100644
> --- a/common/rc
> +++ b/common/rc
> @@ -41,6 +41,13 @@ _md5_checksum()
> md5sum $1 | cut -d ' ' -f1
> }
>
> +# Check whether a fsxattr xflags name ($2) field is set on a given file ($1).
> +# e.g, fsxattr.xflags = 0x80000800 [extsize, has-xattr]
> +_test_fsxattr_xflag()
> +{
> + grep -q "fsxattr.xflags.*\[.*$2.*\]" <($XFS_IO_PROG -c "stat -v" "$1")
> +}
> +
> # Write a byte into a range of a file
> _pwrite_byte() {
> local pattern="$1"
> diff --git a/tests/xfs/207 b/tests/xfs/207
> index bbe21307..394e7e55 100755
> --- a/tests/xfs/207
> +++ b/tests/xfs/207
> @@ -21,15 +21,6 @@ _require_cp_reflink
> _require_xfs_io_command "fiemap"
> _require_xfs_io_command "cowextsize"
>
> -# Takes the fsxattr.xflags line,
> -# i.e. fsxattr.xflags = 0x0 [--------------C-]
> -# and tests whether a flag character is set
> -test_xflag()
> -{
> - local flg=$1
> - grep -q "\[.*${flg}.*\]" && echo "$flg flag set" || echo "$flg flag unset"
> -}
> -
> echo "Format and mount"
> _scratch_mkfs > $seqres.full 2>&1
> _scratch_mount >> $seqres.full 2>&1
> @@ -65,14 +56,16 @@ echo "Set cowextsize and check flag"
> $XFS_IO_PROG -c "cowextsize 1048576" $testdir/file3 | _filter_scratch
> _scratch_cycle_mount
>
> -$XFS_IO_PROG -c "stat" $testdir/file3 | grep 'fsxattr.xflags' | test_xflag "C"
> +_test_fsxattr_xflag "$testdir/file3" "cowextsize" && echo "C flag set" || \
> + echo "C flag unset"
> $XFS_IO_PROG -c "cowextsize" $testdir/file3 | _filter_scratch
>
> echo "Unset cowextsize and check flag"
> $XFS_IO_PROG -c "cowextsize 0" $testdir/file3 | _filter_scratch
> _scratch_cycle_mount
>
> -$XFS_IO_PROG -c "stat" $testdir/file3 | grep 'fsxattr.xflags' | test_xflag "C"
> +_test_fsxattr_xflag "$testdir/file3" "cowextsize" && echo "C flag set" || \
> + echo "C flag unset"
> $XFS_IO_PROG -c "cowextsize" $testdir/file3 | _filter_scratch
>
> status=0
> --
> 2.43.5
>
>
