mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
xfs: be compatible with older mkfs.xfs which has no v5 support
With the change to CRCs by default, some tests are updated to call mkfs with "-m crc=0" option directly, and this breaks testings on older distros where mkfs.xfs doesn't have crc support. Introduce a new variable to tell if mkfs.xfs supports v5 xfs and do tweaks in _scratch_mkfs_xfs_opts() based on it. Signed-off-by: Eryu Guan <eguan@redhat.com> Reviewed-by: Dave Chinner <dchinner@redhat.com> Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
@@ -239,6 +239,17 @@ if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
|
|||||||
export SELINUX_MOUNT_OPTIONS
|
export SELINUX_MOUNT_OPTIONS
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# check if mkfs.xfs supports v5 xfs
|
||||||
|
XFS_MKFS_HAS_NO_META_SUPPORT=""
|
||||||
|
touch /tmp/crc_check.img
|
||||||
|
$MKFS_XFS_PROG -N -d file,name=/tmp/crc_check.img,size=32m -m crc=0 \
|
||||||
|
>/dev/null 2>&1;
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
XFS_MKFS_HAS_NO_META_SUPPORT=true
|
||||||
|
fi
|
||||||
|
rm -f /tmp/crc_check.img
|
||||||
|
export XFS_MKFS_HAS_NO_META_SUPPORT
|
||||||
|
|
||||||
_mount_opts()
|
_mount_opts()
|
||||||
{
|
{
|
||||||
case $FSTYP in
|
case $FSTYP in
|
||||||
|
|||||||
@@ -308,6 +308,11 @@ _scratch_mkfs_xfs_opts()
|
|||||||
{
|
{
|
||||||
mkfs_opts=$*
|
mkfs_opts=$*
|
||||||
|
|
||||||
|
# remove crc related mkfs options if mkfs.xfs doesn't support v5 xfs
|
||||||
|
if [ -n "$XFS_MKFS_HAS_NO_META_SUPPORT" ]; then
|
||||||
|
mkfs_opts=`echo $mkfs_opts | sed "s/-m\s\+crc=.//"`
|
||||||
|
fi
|
||||||
|
|
||||||
_scratch_options mkfs
|
_scratch_options mkfs
|
||||||
|
|
||||||
$MKFS_XFS_PROG $SCRATCH_OPTIONS $mkfs_opts $SCRATCH_DEV
|
$MKFS_XFS_PROG $SCRATCH_OPTIONS $mkfs_opts $SCRATCH_DEV
|
||||||
|
|||||||
+6
-1
@@ -156,7 +156,12 @@ _verify_copy $imgs.image $SCRATCH_DEV $SCRATCH_MNT
|
|||||||
|
|
||||||
echo
|
echo
|
||||||
echo === copying scratch device to single target, large ro device
|
echo === copying scratch device to single target, large ro device
|
||||||
${MKFS_XFS_PROG} -m crc=0 -dfile,name=$imgs.source,size=100g | _filter_mkfs 2>/dev/null
|
mkfs_crc_opts="-m crc=0"
|
||||||
|
if [ -n "$XFS_MKFS_HAS_NO_META_SUPPORT" ]; then
|
||||||
|
mkfs_crc_opts=""
|
||||||
|
fi
|
||||||
|
${MKFS_XFS_PROG} $mkfs_crc_opts -dfile,name=$imgs.source,size=100g \
|
||||||
|
| _filter_mkfs 2>/dev/null
|
||||||
rmdir $imgs.source_dir 2>/dev/null
|
rmdir $imgs.source_dir 2>/dev/null
|
||||||
mkdir $imgs.source_dir
|
mkdir $imgs.source_dir
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user