From: Darrick J. Wong Date: Wed, 28 Apr 2021 04:09:47 +0000 (-0700) Subject: common/rc: relax xfs swapfile support checks X-Git-Tag: v2022.05.01~425 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=2c70e8f8dd3922d8621d341745ff7ef8b178bc1d;p=xfstests-dev.git common/rc: relax xfs swapfile support checks In commit 725feeff, I forgot that xfs has *not* always supported all swap file configurations -- the bmap swapfile activation prior to the introduction of iomap_swapfile_activate did not permit the use of unwritten extents in the swap file. Therefore, kick xfs out of the always-supported list. Fixes: 725feeff ("common/rc: swapon should not fail for given FS in _require_scratch_swapfile()") Signed-off-by: Darrick J. Wong Reviewed-by: Brian Foster Signed-off-by: Eryu Guan --- diff --git a/common/rc b/common/rc index 0fe1366c..8e20749e 100644 --- a/common/rc +++ b/common/rc @@ -2534,10 +2534,10 @@ _require_scratch_swapfile() # Minimum size for mkswap is 10 pages _format_swapfile "$SCRATCH_MNT/swap" $(($(get_page_size) * 10)) - # ext* and xfs have supported all variants of swap files since their + # ext* has supported all variants of swap files since their # introduction, so swapon should not fail. case "$FSTYP" in - ext2|ext3|ext4|xfs) + ext2|ext3|ext4) if ! swapon "$SCRATCH_MNT/swap" >/dev/null 2>&1; then _scratch_unmount _fail "swapon failed for $FSTYP"