[PATCH v2] generic/095, generic/247: unmount correct devices

[Eric Biggers <ebiggers3@gmail.com>]

From: Eric Biggers <ebiggers@google.com>

In commit d55123c080cb ("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.

Signed-off-by: Eric Biggers <ebiggers@google.com>
---
 tests/generic/095 | 4 ++++
 tests/generic/247 | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/generic/095 b/tests/generic/095
index 9dff1bc1..050215d4 100755
--- a/tests/generic/095
+++ b/tests/generic/095
@@ -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
diff --git a/tests/generic/247 b/tests/generic/247
index 509e8808..aac70780 100755
--- a/tests/generic/247
+++ b/tests/generic/247
@@ -82,7 +82,7 @@ echo "Silence is golden."
 
 # unmount and check dmesg, filtering out expected XFS warnings about mixed
 # mmap/dio
-_scratch_unmount
+_test_unmount
 if [ "$FSTYP" == "xfs" ]; then
 	_check_dmesg _filter_xfs_dmesg
 else
-- 
2.13.2