diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2022-08-17 19:41:21 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2024-02-16 19:47:39 -0500 |
| commit | 730bfc8539d1529ecf62ce935c91ea67ccf78c1b (patch) | |
| tree | 5a17757cd4da9fd76624848fda1cae36ff4abecb | |
| parent | 2be753c3858e9485cd2c01f059fe9cc147701de0 (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-x | tests/generic/081 | 2 | ||||
| -rwxr-xr-x | tests/generic/108 | 2 | ||||
| -rwxr-xr-x | tests/generic/648 | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/generic/081 b/tests/generic/081 index 22ac94de..7146781a 100755 --- a/tests/generic/081 +++ b/tests/generic/081 @@ -80,7 +80,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 efe66ba5..89d9c994 100755 --- a/tests/generic/108 +++ b/tests/generic/108 @@ -64,7 +64,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 |