generic/095, generic/247: unmount correct devices

In commit d55123c080 ("generic/247: filter out expected XFS warnings
for mixed mmap/direct I/O"), _scratch_unmount was removed from
generic/095 and added to generic/247.  But actually generic/095 *should*
be unmounting SCRATCH_DEV; and generic/247 should be unmounting
TEST_DEV, not SCRATCH_DEV, since it doesn't use a scratch device (it was
failing if SCRATCH_DEV was not defined).  Fix it.

[eguan: the original bug was introduced by me not Brian, as I
removed _scratch_unmount from wrong test]

Signed-off-by: Eric Biggers <ebiggers@google.com>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
This commit is contained in:
Eric Biggers
2017-07-05 22:31:36 -07:00
committed by Eryu Guan
parent c7169fada6
commit eeea532122
2 changed files with 5 additions and 1 deletions
+4
View File
@@ -122,6 +122,10 @@ $FIO_PROG $fio_config >>$seqres.full 2>&1
# to be potent, we don't want to simply _disable_dmesg_check which could miss
# other potential bugs. So filter out the intentional WARNINGs, make sure test
# doesn't fail because of this warning and fails on other WARNINGs.
# umount before checking dmesg in case umount triggers any WARNING or Oops
_scratch_unmount
if [ "$FSTYP" == "xfs" ]; then
_check_dmesg _filter_xfs_dmesg
else