On Wed, Feb 19, 2025 at 11:17:43PM +0100, David Sterba wrote:
> The linux kernel removed Reiserfs support in 6.13 so remove it from the
> tests as well.
>
> Signed-off-by: David Sterba <dsterba@xxxxxxxx>
Buhbye!
Reviewed-by: "Darrick J. Wong" <djwong@xxxxxxxxxx>
--D
> ---
>
> Arguably reiser4 support could be removed as well as there's no recent
> upstream activity.
>
> common/config | 7 -------
> common/quota | 4 ++--
> common/rc | 5 +----
> tests/generic/740 | 4 ----
> 4 files changed, 3 insertions(+), 17 deletions(-)
>
> diff --git a/common/config b/common/config
> index 77f3fc153eb731..a9a1ce6c3655cf 100644
> --- a/common/config
> +++ b/common/config
> @@ -384,10 +384,6 @@ _common_mount_opts()
> f2fs)
> echo "-o acl,user_xattr $F2FS_MOUNT_OPTIONS"
> ;;
> - reiserfs)
> - # acls & xattrs aren't turned on by default on reiserfs
> - echo "-o acl,user_xattr $REISERFS_MOUNT_OPTIONS"
> - ;;
> reiser4)
> # acls & xattrs aren't supported by reiser4
> echo $REISER4_MOUNT_OPTIONS
> @@ -441,9 +437,6 @@ _mkfs_opts()
> ceph)
> export MKFS_OPTIONS=$CEPHFS_MKFS_OPTIONS
> ;;
> - reiserfs)
> - export MKFS_OPTIONS="$REISERFS_MKFS_OPTIONS -q"
> - ;;
> reiser4)
> export MKFS_OPTIONS=$REISER4_MKFS_OPTIONS
> ;;
> diff --git a/common/quota b/common/quota
> index 8688116c6547a9..9c3d1bb4ace4bb 100644
> --- a/common/quota
> +++ b/common/quota
> @@ -12,7 +12,7 @@ _require_quota()
> [ -n "$QUOTA_PROG" ] || _notrun "Quota user tools not installed"
>
> case $FSTYP in
> - ext2|ext3|ext4|f2fs|reiserfs)
> + ext2|ext3|ext4|f2fs)
> if [ ! -d /proc/sys/fs/quota ]; then
> _notrun "Installed kernel does not support quotas"
> fi
> @@ -347,7 +347,7 @@ _check_quota_usage()
>
> VFS_QUOTA=0
> case $FSTYP in
> - ext2|ext3|ext4|f2fs|reiserfs|gfs2|bcachefs)
> + ext2|ext3|ext4|f2fs|gfs2|bcachefs)
> VFS_QUOTA=1
> quotaon -f -u -g $SCRATCH_MNT 2>/dev/null
> ;;
> diff --git a/common/rc b/common/rc
> index 6840bb1dfa1001..9d16df5fc0d5ae 100644
> --- a/common/rc
> +++ b/common/rc
> @@ -1163,7 +1163,7 @@ _try_scratch_mkfs_sized()
> btrfs)
> def_blksz=`echo $MKFS_OPTIONS | sed -rn 's/.*-s ?+([0-9]+).*/\1/p'`
> ;;
> - ext2|ext3|ext4|reiser4|ocfs2|reiserfs)
> + ext2|ext3|ext4|reiser4|ocfs2)
> def_blksz=`echo $MKFS_OPTIONS | sed -rn 's/.*-b ?+([0-9]+).*/\1/p'`
> ;;
> udf)
> @@ -1267,9 +1267,6 @@ _try_scratch_mkfs_sized()
> jfs)
> ${MKFS_PROG} -t $FSTYP $MKFS_OPTIONS "$@" $SCRATCH_DEV $blocks
> ;;
> - reiserfs)
> - ${MKFS_PROG} -t $FSTYP $MKFS_OPTIONS -b $blocksize "$@" $SCRATCH_DEV $blocks
> - ;;
> reiser4)
> # mkfs.resier4 requires size in KB as input for creating filesystem
> $MKFS_REISER4_PROG $MKFS_OPTIONS -y -b $blocksize "$@" $SCRATCH_DEV \
> diff --git a/tests/generic/740 b/tests/generic/740
> index 10817521cc9342..c167dbef2ff68a 100755
> --- a/tests/generic/740
> +++ b/tests/generic/740
> @@ -63,10 +63,6 @@ do
> # "quick" format that doesn't zero the entire device
> postargs="--quick"
> ;;
> - reiserfs|reiser4)
> - preop="echo y |"
> - preargs="-f"
> - ;;
> *)
> ;;
> esac
> --
> 2.47.1
>
>
