[PATCH 0/2] source fs specific common file properly

[PATCH 0/2] source fs specific common file properly

[Zorro Lang]

It starts with generic/402 always fails on overlayfs as:

  QA output created by 402
  ./common/rc: line 2441: _xfs_timestamp_range: command not found
  ./common/rc: line 2403: [: syntax error: '-1' unexpected
  ./common/rc: line 2408: [: -le: unary operator expected
  ./common/rc: line 2441: _xfs_timestamp_range: command not found
  0;0 != 1;1
  0;0 != 1;1
  Silence is golden

Due to if FSTYP is overlay, we only source common/overlay file. But we
still need the helpers of the underlying filesystem. So I think we need
to source the common/$OVL_BASE_FSTYP in common/overlay.

Besides overlayfs, I'd like to extend other uplying fs support its
BASE_FSTYP, so other uplying fs (e.g. nfs, cifs, glusterfs ...) will
do like this.

Thanks,
Zorro

[PATCH 1/2] common: source base fs specific common file

[Zorro Lang]

When tests overlayfs, sometimes we need the underlying fs specific
helpers, e.g. common/rc has:
  _filesystem_timestamp_range $OVL_BASE_TEST_DEV $OVL_BASE_FSTYP

So when we source common/overlay, better to source OVL_BASE_FSTYP
too.

Signed-off-by: Zorro Lang <zlang@kernel.org>
---
 common/config  | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++
 common/overlay |  4 ++++
 common/rc      | 49 +----------------------------------------
 3 files changed, 64 insertions(+), 48 deletions(-)

diff --git a/common/config b/common/config
index c6428f90..558f148b 100644
--- a/common/config
+++ b/common/config
@@ -481,6 +481,65 @@ _fsck_opts()
 	esac
 }
 
+# check necessary running dependences then source sepcific fs helpers
+_source_specific_fs()
+{
+	local fs=$1
+
+	if [ -z "$fs" ];then
+		fs=$FSTYP
+	fi
+
+	case "$fs" in
+	xfs)
+		[ "$XFS_LOGPRINT_PROG" = "" ] && _fatal "xfs_logprint not found"
+		[ "$XFS_REPAIR_PROG" = "" ] && _fatal "xfs_repair not found"
+		[ "$XFS_DB_PROG" = "" ] && _fatal "xfs_db not found"
+		[ "$MKFS_XFS_PROG" = "" ] && _fatal "mkfs_xfs not found"
+		[ "$XFS_INFO_PROG" = "" ] && _fatal "xfs_info not found"
+
+		. ./common/xfs
+		;;
+	udf)
+		[ "$MKFS_UDF_PROG" = "" ] && _fatal "mkfs_udf/mkudffs not found"
+		;;
+	btrfs)
+		[ "$MKFS_BTRFS_PROG" = "" ] && _fatal "mkfs.btrfs not found"
+
+		. ./common/btrfs
+		;;
+	ext4)
+		[ "$MKFS_EXT4_PROG" = "" ] && _fatal "mkfs.ext4 not found"
+		;;
+	f2fs)
+		[ "$MKFS_F2FS_PROG" = "" ] && _fatal "mkfs.f2fs not found"
+		;;
+	nfs)
+		. ./common/nfs
+		;;
+	cifs)
+		;;
+	9p)
+		;;
+	ceph)
+		. ./common/ceph
+		;;
+	glusterfs)
+		;;
+	overlay)
+		. ./common/overlay
+		;;
+	reiser4)
+		[ "$MKFS_REISER4_PROG" = "" ] && _fatal "mkfs.reiser4 not found"
+		;;
+	pvfs2)
+		;;
+	ubifs)
+		[ "$UBIUPDATEVOL_PROG" = "" ] && _fatal "ubiupdatevol not found"
+		;;
+	esac
+}
+
 known_hosts()
 {
 	[ "$HOST_CONFIG_DIR" ] || HOST_CONFIG_DIR=`pwd`/configs
diff --git a/common/overlay b/common/overlay
index c4e7ee58..e35419d0 100644
--- a/common/overlay
+++ b/common/overlay
@@ -12,6 +12,10 @@ export OVL_XATTR_NLINK="trusted.overlay.nlink"
 export OVL_XATTR_UPPER="trusted.overlay.upper"
 export OVL_XATTR_METACOPY="trusted.overlay.metacopy"
 
+if [ -n "$OVL_BASE_FSTYP" ];then
+	_source_specific_fs $OVL_BASE_FSTYP
+fi
+
 # helper function to do the actual overlayfs mount operation
 _overlay_mount_dirs()
 {
diff --git a/common/rc b/common/rc
index 70a15f9c..2f31ca46 100644
--- a/common/rc
+++ b/common/rc
@@ -96,54 +96,7 @@ _log_err()
 umask 022
 
 # check for correct setup and source the $FSTYP specific functions now
-case "$FSTYP" in
-    xfs)
-	 [ "$XFS_LOGPRINT_PROG" = "" ] && _fatal "xfs_logprint not found"
-	 [ "$XFS_REPAIR_PROG" = "" ] && _fatal "xfs_repair not found"
-	 [ "$XFS_DB_PROG" = "" ] && _fatal "xfs_db not found"
-	 [ "$MKFS_XFS_PROG" = "" ] && _fatal "mkfs_xfs not found"
-	 [ "$XFS_INFO_PROG" = "" ] && _fatal "xfs_info not found"
-
-	 . ./common/xfs
-	 ;;
-    udf)
-	 [ "$MKFS_UDF_PROG" = "" ] && _fatal "mkfs_udf/mkudffs not found"
-	 ;;
-    btrfs)
-	 [ "$MKFS_BTRFS_PROG" = "" ] && _fatal "mkfs.btrfs not found"
-
-	 . ./common/btrfs
-	 ;;
-    ext4)
-	 [ "$MKFS_EXT4_PROG" = "" ] && _fatal "mkfs.ext4 not found"
-	 ;;
-    f2fs)
-	 [ "$MKFS_F2FS_PROG" = "" ] && _fatal "mkfs.f2fs not found"
-	 ;;
-    nfs)
-	 . ./common/nfs
-	 ;;
-    cifs)
-	 ;;
-    9p)
-	 ;;
-    ceph)
-	 . ./common/ceph
-	 ;;
-    glusterfs)
-	 ;;
-    overlay)
-	 . ./common/overlay
-	 ;;
-    reiser4)
-	 [ "$MKFS_REISER4_PROG" = "" ] && _fatal "mkfs.reiser4 not found"
-	 ;;
-    pvfs2)
-	;;
-    ubifs)
-	[ "$UBIUPDATEVOL_PROG" = "" ] && _fatal "ubiupdatevol not found"
-	;;
-esac
+_source_specific_fs $FSTYP
 
 if [ ! -z "$REPORT_LIST" ]; then
 	. ./common/report
-- 
2.31.1

Re: [PATCH 1/2] common: source base fs specific common file

[Amir Goldstein]

On Wed, May 25, 2022 at 2:18 PM Zorro Lang <zlang@kernel.org> wrote:
>
> When tests overlayfs, sometimes we need the underlying fs specific
> helpers, e.g. common/rc has:
>   _filesystem_timestamp_range $OVL_BASE_TEST_DEV $OVL_BASE_FSTYP
>
> So when we source common/overlay, better to source OVL_BASE_FSTYP
> too.
>
> Signed-off-by: Zorro Lang <zlang@kernel.org>

Makes sense.

Reviewed-by: Amir Goldstein <amir73il@gmail.com>

> ---
>  common/config  | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++
>  common/overlay |  4 ++++
>  common/rc      | 49 +----------------------------------------
>  3 files changed, 64 insertions(+), 48 deletions(-)
>
> diff --git a/common/config b/common/config
> index c6428f90..558f148b 100644
> --- a/common/config
> +++ b/common/config
> @@ -481,6 +481,65 @@ _fsck_opts()
>         esac
>  }
>
> +# check necessary running dependences then source sepcific fs helpers
> +_source_specific_fs()
> +{
> +       local fs=$1
> +
> +       if [ -z "$fs" ];then
> +               fs=$FSTYP
> +       fi
> +
> +       case "$fs" in
> +       xfs)
> +               [ "$XFS_LOGPRINT_PROG" = "" ] && _fatal "xfs_logprint not found"
> +               [ "$XFS_REPAIR_PROG" = "" ] && _fatal "xfs_repair not found"
> +               [ "$XFS_DB_PROG" = "" ] && _fatal "xfs_db not found"
> +               [ "$MKFS_XFS_PROG" = "" ] && _fatal "mkfs_xfs not found"
> +               [ "$XFS_INFO_PROG" = "" ] && _fatal "xfs_info not found"
> +
> +               . ./common/xfs
> +               ;;
> +       udf)
> +               [ "$MKFS_UDF_PROG" = "" ] && _fatal "mkfs_udf/mkudffs not found"
> +               ;;
> +       btrfs)
> +               [ "$MKFS_BTRFS_PROG" = "" ] && _fatal "mkfs.btrfs not found"
> +
> +               . ./common/btrfs
> +               ;;
> +       ext4)
> +               [ "$MKFS_EXT4_PROG" = "" ] && _fatal "mkfs.ext4 not found"
> +               ;;
> +       f2fs)
> +               [ "$MKFS_F2FS_PROG" = "" ] && _fatal "mkfs.f2fs not found"
> +               ;;
> +       nfs)
> +               . ./common/nfs
> +               ;;
> +       cifs)
> +               ;;
> +       9p)
> +               ;;
> +       ceph)
> +               . ./common/ceph
> +               ;;
> +       glusterfs)
> +               ;;
> +       overlay)
> +               . ./common/overlay
> +               ;;
> +       reiser4)
> +               [ "$MKFS_REISER4_PROG" = "" ] && _fatal "mkfs.reiser4 not found"
> +               ;;
> +       pvfs2)
> +               ;;
> +       ubifs)
> +               [ "$UBIUPDATEVOL_PROG" = "" ] && _fatal "ubiupdatevol not found"
> +               ;;
> +       esac
> +}
> +
>  known_hosts()
>  {
>         [ "$HOST_CONFIG_DIR" ] || HOST_CONFIG_DIR=`pwd`/configs
> diff --git a/common/overlay b/common/overlay
> index c4e7ee58..e35419d0 100644
> --- a/common/overlay
> +++ b/common/overlay
> @@ -12,6 +12,10 @@ export OVL_XATTR_NLINK="trusted.overlay.nlink"
>  export OVL_XATTR_UPPER="trusted.overlay.upper"
>  export OVL_XATTR_METACOPY="trusted.overlay.metacopy"
>
> +if [ -n "$OVL_BASE_FSTYP" ];then
> +       _source_specific_fs $OVL_BASE_FSTYP
> +fi
> +
>  # helper function to do the actual overlayfs mount operation
>  _overlay_mount_dirs()
>  {
> diff --git a/common/rc b/common/rc
> index 70a15f9c..2f31ca46 100644
> --- a/common/rc
> +++ b/common/rc
> @@ -96,54 +96,7 @@ _log_err()
>  umask 022
>
>  # check for correct setup and source the $FSTYP specific functions now
> -case "$FSTYP" in
> -    xfs)
> -        [ "$XFS_LOGPRINT_PROG" = "" ] && _fatal "xfs_logprint not found"
> -        [ "$XFS_REPAIR_PROG" = "" ] && _fatal "xfs_repair not found"
> -        [ "$XFS_DB_PROG" = "" ] && _fatal "xfs_db not found"
> -        [ "$MKFS_XFS_PROG" = "" ] && _fatal "mkfs_xfs not found"
> -        [ "$XFS_INFO_PROG" = "" ] && _fatal "xfs_info not found"
> -
> -        . ./common/xfs
> -        ;;
> -    udf)
> -        [ "$MKFS_UDF_PROG" = "" ] && _fatal "mkfs_udf/mkudffs not found"
> -        ;;
> -    btrfs)
> -        [ "$MKFS_BTRFS_PROG" = "" ] && _fatal "mkfs.btrfs not found"
> -
> -        . ./common/btrfs
> -        ;;
> -    ext4)
> -        [ "$MKFS_EXT4_PROG" = "" ] && _fatal "mkfs.ext4 not found"
> -        ;;
> -    f2fs)
> -        [ "$MKFS_F2FS_PROG" = "" ] && _fatal "mkfs.f2fs not found"
> -        ;;
> -    nfs)
> -        . ./common/nfs
> -        ;;
> -    cifs)
> -        ;;
> -    9p)
> -        ;;
> -    ceph)
> -        . ./common/ceph
> -        ;;
> -    glusterfs)
> -        ;;
> -    overlay)
> -        . ./common/overlay
> -        ;;
> -    reiser4)
> -        [ "$MKFS_REISER4_PROG" = "" ] && _fatal "mkfs.reiser4 not found"
> -        ;;
> -    pvfs2)
> -       ;;
> -    ubifs)
> -       [ "$UBIUPDATEVOL_PROG" = "" ] && _fatal "ubiupdatevol not found"
> -       ;;
> -esac
> +_source_specific_fs $FSTYP
>
>  if [ ! -z "$REPORT_LIST" ]; then
>         . ./common/report
> --
> 2.31.1
>

[PATCH 2/2] tests: remove redundant common/$FSTYP importing

[Zorro Lang]

As fstests intensively source specific common/$FSTYP files in
common/rc, at the beginning of ./check running. Each single case
doesn't need to import that again.

Signed-off-by: Zorro Lang <zlang@kernel.org>
---
 tests/btrfs/177 | 1 -
 tests/btrfs/258 | 1 -
 tests/btrfs/259 | 1 -
 tests/xfs/422   | 1 -
 tests/xfs/423   | 1 -
 tests/xfs/517   | 1 -
 6 files changed, 6 deletions(-)

diff --git a/tests/btrfs/177 b/tests/btrfs/177
index 2fd11e89..7b004b83 100755
--- a/tests/btrfs/177
+++ b/tests/btrfs/177
@@ -10,7 +10,6 @@
 _begin_fstest auto quick swap balance
 
 . ./common/filter
-. ./common/btrfs
 
 # Modify as appropriate.
 _supported_fs btrfs
diff --git a/tests/btrfs/258 b/tests/btrfs/258
index 158eaf79..8fc828df 100755
--- a/tests/btrfs/258
+++ b/tests/btrfs/258
@@ -11,7 +11,6 @@
 _begin_fstest auto defrag quick
 
 . ./common/btrfs
-. ./common/filter
 
 # real QA test starts here
 
diff --git a/tests/btrfs/259 b/tests/btrfs/259
index e7bd8ddd..92d0b9a6 100755
--- a/tests/btrfs/259
+++ b/tests/btrfs/259
@@ -12,7 +12,6 @@ _begin_fstest auto quick defrag
 
 # Import common functions.
 . ./common/filter
-. ./common/btrfs
 
 # real QA test starts here
 
diff --git a/tests/xfs/422 b/tests/xfs/422
index 77db492e..175253aa 100755
--- a/tests/xfs/422
+++ b/tests/xfs/422
@@ -17,7 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/filter
 . ./common/fuzzy
 . ./common/inject
-. ./common/xfs
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/423 b/tests/xfs/423
index be56f311..c9dfaece 100755
--- a/tests/xfs/423
+++ b/tests/xfs/423
@@ -18,7 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/filter
 . ./common/fuzzy
 . ./common/inject
-. ./common/xfs
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/517 b/tests/xfs/517
index 512f795f..88c4f43b 100755
--- a/tests/xfs/517
+++ b/tests/xfs/517
@@ -23,7 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/fuzzy
 . ./common/inject
-. ./common/xfs
 
 # real QA test starts here
 _supported_fs xfs
-- 
2.31.1

Re: [PATCH 2/2] tests: remove redundant common/$FSTYP importing

[Dave Chinner]

On Wed, May 25, 2022 at 03:34:27PM +0800, Zorro Lang wrote:
> As fstests intensively source specific common/$FSTYP files in
> common/rc, at the beginning of ./check running. Each single case
> doesn't need to import that again.
> 
> Signed-off-by: Zorro Lang <zlang@kernel.org>
> ---
>  tests/btrfs/177 | 1 -
>  tests/btrfs/258 | 1 -
>  tests/btrfs/259 | 1 -
>  tests/xfs/422   | 1 -
>  tests/xfs/423   | 1 -
>  tests/xfs/517   | 1 -
>  6 files changed, 6 deletions(-)
> 
> diff --git a/tests/btrfs/177 b/tests/btrfs/177
> index 2fd11e89..7b004b83 100755
> --- a/tests/btrfs/177
> +++ b/tests/btrfs/177
> @@ -10,7 +10,6 @@
>  _begin_fstest auto quick swap balance
>  
>  . ./common/filter
> -. ./common/btrfs
>  
>  # Modify as appropriate.
>  _supported_fs btrfs
> diff --git a/tests/btrfs/258 b/tests/btrfs/258
> index 158eaf79..8fc828df 100755
> --- a/tests/btrfs/258
> +++ b/tests/btrfs/258
> @@ -11,7 +11,6 @@
>  _begin_fstest auto defrag quick
>  
>  . ./common/btrfs
> -. ./common/filter

I think you removed the wrong line here.

-Dave.
-- 
Dave Chinner
david@fromorbit.com

Re: [PATCH 2/2] tests: remove redundant common/$FSTYP importing

[Zorro Lang]

On Thu, May 26, 2022 at 10:13:26AM +1000, Dave Chinner wrote:
> On Wed, May 25, 2022 at 03:34:27PM +0800, Zorro Lang wrote:
> > As fstests intensively source specific common/$FSTYP files in
> > common/rc, at the beginning of ./check running. Each single case
> > doesn't need to import that again.
> > 
> > Signed-off-by: Zorro Lang <zlang@kernel.org>
> > ---
> >  tests/btrfs/177 | 1 -
> >  tests/btrfs/258 | 1 -
> >  tests/btrfs/259 | 1 -
> >  tests/xfs/422   | 1 -
> >  tests/xfs/423   | 1 -
> >  tests/xfs/517   | 1 -
> >  6 files changed, 6 deletions(-)
> > 
> > diff --git a/tests/btrfs/177 b/tests/btrfs/177
> > index 2fd11e89..7b004b83 100755
> > --- a/tests/btrfs/177
> > +++ b/tests/btrfs/177
> > @@ -10,7 +10,6 @@
> >  _begin_fstest auto quick swap balance
> >  
> >  . ./common/filter
> > -. ./common/btrfs
> >  
> >  # Modify as appropriate.
> >  _supported_fs btrfs
> > diff --git a/tests/btrfs/258 b/tests/btrfs/258
> > index 158eaf79..8fc828df 100755
> > --- a/tests/btrfs/258
> > +++ b/tests/btrfs/258
> > @@ -11,7 +11,6 @@
> >  _begin_fstest auto defrag quick
> >  
> >  . ./common/btrfs
> > -. ./common/filter
> 
> I think you removed the wrong line here.

Oh, sorry, we resend this patch again.

Thanks,
Zorro

> 
> -Dave.
> -- 
> Dave Chinner
> david@fromorbit.com
> 

[PATCH v2 2/2] tests: remove redundant common/$FSTYP importing

[Zorro Lang]

As fstests intensively source specific common/$FSTYP files in
common/rc, at the beginning of ./check running. Each single case
doesn't need to import that again.

Signed-off-by: Zorro Lang <zlang@kernel.org>
---

I removed "./common/filter" in btrfs/258 uncarefully, fix that in this V2.

Thanks,
Zorro

 tests/btrfs/177 | 1 -
 tests/btrfs/258 | 1 -
 tests/btrfs/259 | 1 -
 tests/xfs/422   | 1 -
 tests/xfs/423   | 1 -
 tests/xfs/517   | 1 -
 6 files changed, 6 deletions(-)

diff --git a/tests/btrfs/177 b/tests/btrfs/177
index 2fd11e89..7b004b83 100755
--- a/tests/btrfs/177
+++ b/tests/btrfs/177
@@ -10,7 +10,6 @@
 _begin_fstest auto quick swap balance
 
 . ./common/filter
-. ./common/btrfs
 
 # Modify as appropriate.
 _supported_fs btrfs
diff --git a/tests/btrfs/258 b/tests/btrfs/258
index 158eaf79..da073333 100755
--- a/tests/btrfs/258
+++ b/tests/btrfs/258
@@ -10,7 +10,6 @@
 . ./common/preamble
 _begin_fstest auto defrag quick
 
-. ./common/btrfs
 . ./common/filter
 
 # real QA test starts here
diff --git a/tests/btrfs/259 b/tests/btrfs/259
index e7bd8ddd..92d0b9a6 100755
--- a/tests/btrfs/259
+++ b/tests/btrfs/259
@@ -12,7 +12,6 @@ _begin_fstest auto quick defrag
 
 # Import common functions.
 . ./common/filter
-. ./common/btrfs
 
 # real QA test starts here
 
diff --git a/tests/xfs/422 b/tests/xfs/422
index 77db492e..175253aa 100755
--- a/tests/xfs/422
+++ b/tests/xfs/422
@@ -17,7 +17,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/filter
 . ./common/fuzzy
 . ./common/inject
-. ./common/xfs
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/423 b/tests/xfs/423
index be56f311..c9dfaece 100755
--- a/tests/xfs/423
+++ b/tests/xfs/423
@@ -18,7 +18,6 @@ _register_cleanup "_cleanup" BUS
 . ./common/filter
 . ./common/fuzzy
 . ./common/inject
-. ./common/xfs
 
 # real QA test starts here
 _supported_fs xfs
diff --git a/tests/xfs/517 b/tests/xfs/517
index 512f795f..88c4f43b 100755
--- a/tests/xfs/517
+++ b/tests/xfs/517
@@ -23,7 +23,6 @@ _cleanup()
 . ./common/filter
 . ./common/fuzzy
 . ./common/inject
-. ./common/xfs
 
 # real QA test starts here
 _supported_fs xfs
-- 
2.31.1

Re: [PATCH v2 2/2] tests: remove redundant common/$FSTYP importing

[Dave Chinner]

On Thu, May 26, 2022 at 09:23:17AM +0800, Zorro Lang wrote:
> As fstests intensively source specific common/$FSTYP files in
> common/rc, at the beginning of ./check running. Each single case
> doesn't need to import that again.
> 
> Signed-off-by: Zorro Lang <zlang@kernel.org>

Looks good now.

Reviewed-by: Dave Chinner <dchinner@redhat.com>
-- 
Dave Chinner
david@fromorbit.com

Re: [PATCH v2 2/2] tests: remove redundant common/$FSTYP importing

[Amir Goldstein]

On Thu, May 26, 2022 at 9:47 AM Zorro Lang <zlang@kernel.org> wrote:
>
> As fstests intensively source specific common/$FSTYP files in
> common/rc, at the beginning of ./check running. Each single case
> doesn't need to import that again.
>
> Signed-off-by: Zorro Lang <zlang@kernel.org>
> ---

Looks fine.

Reviewed-by: Amir Goldstein <amir73il@gmail.com>

>
> I removed "./common/filter" in btrfs/258 uncarefully, fix that in this V2.
>
> Thanks,
> Zorro
>
>  tests/btrfs/177 | 1 -
>  tests/btrfs/258 | 1 -
>  tests/btrfs/259 | 1 -
>  tests/xfs/422   | 1 -
>  tests/xfs/423   | 1 -
>  tests/xfs/517   | 1 -
>  6 files changed, 6 deletions(-)
>
> diff --git a/tests/btrfs/177 b/tests/btrfs/177
> index 2fd11e89..7b004b83 100755
> --- a/tests/btrfs/177
> +++ b/tests/btrfs/177
> @@ -10,7 +10,6 @@
>  _begin_fstest auto quick swap balance
>
>  . ./common/filter
> -. ./common/btrfs
>
>  # Modify as appropriate.
>  _supported_fs btrfs
> diff --git a/tests/btrfs/258 b/tests/btrfs/258
> index 158eaf79..da073333 100755
> --- a/tests/btrfs/258
> +++ b/tests/btrfs/258
> @@ -10,7 +10,6 @@
>  . ./common/preamble
>  _begin_fstest auto defrag quick
>
> -. ./common/btrfs
>  . ./common/filter
>
>  # real QA test starts here
> diff --git a/tests/btrfs/259 b/tests/btrfs/259
> index e7bd8ddd..92d0b9a6 100755
> --- a/tests/btrfs/259
> +++ b/tests/btrfs/259
> @@ -12,7 +12,6 @@ _begin_fstest auto quick defrag
>
>  # Import common functions.
>  . ./common/filter
> -. ./common/btrfs
>
>  # real QA test starts here
>
> diff --git a/tests/xfs/422 b/tests/xfs/422
> index 77db492e..175253aa 100755
> --- a/tests/xfs/422
> +++ b/tests/xfs/422
> @@ -17,7 +17,6 @@ _register_cleanup "_cleanup" BUS
>  . ./common/filter
>  . ./common/fuzzy
>  . ./common/inject
> -. ./common/xfs
>
>  # real QA test starts here
>  _supported_fs xfs
> diff --git a/tests/xfs/423 b/tests/xfs/423
> index be56f311..c9dfaece 100755
> --- a/tests/xfs/423
> +++ b/tests/xfs/423
> @@ -18,7 +18,6 @@ _register_cleanup "_cleanup" BUS
>  . ./common/filter
>  . ./common/fuzzy
>  . ./common/inject
> -. ./common/xfs
>
>  # real QA test starts here
>  _supported_fs xfs
> diff --git a/tests/xfs/517 b/tests/xfs/517
> index 512f795f..88c4f43b 100755
> --- a/tests/xfs/517
> +++ b/tests/xfs/517
> @@ -23,7 +23,6 @@ _cleanup()
>  . ./common/filter
>  . ./common/fuzzy
>  . ./common/inject
> -. ./common/xfs
>
>  # real QA test starts here
>  _supported_fs xfs
> --
> 2.31.1
>