summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2022-08-17 19:41:21 -0400
committerKent Overstreet <kent.overstreet@linux.dev>2024-07-11 19:28:36 -0400
commitd6f83765e8c5e0d87cacaf955265d19b8516b84f (patch)
tree146bcabe72411bb4f2fdb8bc8a98d6fbbcc204b1
parenta0d2b18db1dd8cbed72327450b159e9383244322 (diff)
Make sure to pass -t $FSTYP to mount
When running a kernel that supports other unrelated filesystems we can get spurious errors without this. Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
-rwxr-xr-xtests/generic/0812
-rwxr-xr-xtests/generic/1082
-rwxr-xr-xtests/generic/6482
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/generic/081 b/tests/generic/081
index 0996f221..c3cd41be 100755
--- a/tests/generic/081
+++ b/tests/generic/081
@@ -83,7 +83,7 @@ _mkfs_dev /dev/mapper/$vgname-$lvname
$LVM_PROG lvcreate -s -L 4M -n $snapname $vgname/$lvname >>$seqres.full 2>&1 || \
_fail "Failed to create snapshot"
-_mount /dev/mapper/$vgname-$snapname $mnt
+_mount -t $FSTYP /dev/mapper/$vgname-$snapname $mnt
# write 5M data to the snapshot
$XFS_IO_PROG -fc "pwrite 0 5m" -c fsync $mnt/testfile >>$seqres.full 2>&1
diff --git a/tests/generic/108 b/tests/generic/108
index 07703fc8..c1f77e1b 100755
--- a/tests/generic/108
+++ b/tests/generic/108
@@ -66,7 +66,7 @@ $UDEV_SETTLE_PROG >>$seqres.full 2>&1
# above vgcreate/lvcreate operations
_mkfs_dev /dev/mapper/$vgname-$lvname
-_mount /dev/mapper/$vgname-$lvname $SCRATCH_MNT
+_mount -t $FSTYP /dev/mapper/$vgname-$lvname $SCRATCH_MNT
# create a test file with contiguous blocks which will span across the 2 disks
$XFS_IO_PROG -f -c "pwrite 0 16M" -c fsync $SCRATCH_MNT/testfile >>$seqres.full
diff --git a/tests/generic/648 b/tests/generic/648
index 3b3544ff..2ae96ee2 100755
--- a/tests/generic/648
+++ b/tests/generic/648
@@ -137,7 +137,7 @@ done
# Make sure the fs image file is ok
if [ -f "$loopimg" ]; then
- if _mount $loopimg $loopmnt -o loop; then
+ if _mount -o loop -t $FSTYP $loopimg $loopmnt -o loop; then
$UMOUNT_PROG $loopmnt &> /dev/null
else
_metadump_dev $DMERROR_DEV $seqres.scratch.final.md