Skip to contentSkip to conversation

generic/247: unmount test device, not scratch device

PATCH In review Eric Biggers 2 participants 4 messages Jul 5, 2017 – Jul 6, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 generic/247: unmount test device, not scratch device

From: Eric Biggers <[email protected]>

Commit d55123c080cb ("generic/247: filter out expected XFS warnings for mixed mmap/direct I/O") made generic/247 start explicitly unmounting the scratch device. However, the test doesn't actually use the scratch device, so it will fail if SCRATCH_DEV is undefined. Fix it by unmounting the test device instead.

---
 tests/generic/247 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/generic/247 +1 -1
index 509e8808..aac70780 100755
@@ -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
Signature · 1 line
2.13.2.725.g09c95d1e9-goog
#1 lore raw
Quoted 9 lines · Eric Biggers

From: Eric Biggers <[email protected]>

Commit d55123c080cb ("generic/247: filter out expected XFS warnings for mixed mmap/direct I/O") made generic/247 start explicitly unmounting the scratch device. However, the test doesn't actually use the scratch device, so it will fail if SCRATCH_DEV is undefined. Fix it by unmounting the test device instead.

Thanks for the fix! I found this in my review and I remembered I removed the _scratch_unmount and updated the comments accordingly at commit time, but clearly I didn't.

Thanks,
Eryu

Quoted 24 lines
---
 tests/generic/247 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/generic/247 +1 -1
index 509e8808..aac70780 100755
@@ -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
Signature · 6 lines
2.13.2.725.g09c95d1e9-goog

--
To unsubscribe from this list: send the line "unsubscribe fstests" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#2 lore raw
Quoted 9 lines · Eryu Guan
Quoted 8 lines · Eric Biggers

From: Eric Biggers <[email protected]>

Commit d55123c080cb ("generic/247: filter out expected XFS warnings for mixed mmap/direct I/O") made generic/247 start explicitly unmounting the scratch device. However, the test doesn't actually use the scratch device, so it will fail if SCRATCH_DEV is undefined. Fix it by unmounting the test device instead.

Quoted 6 lines
Quoted 1 line

Thanks for the fix! I found this in my review and I remembered I removed the _scratch_unmount and updated the comments accordingly at commit time, but clearly I didn't.

It was removed from generic/095 (maybe by accident?) but not generic/247. Perhaps it needs to be added back to generic/095?

Eric

#3 lore raw
Quoted 12 lines · Eric Biggers
Quoted 11 lines · Eryu Guan
Quoted 9 lines · Eric Biggers

From: Eric Biggers <[email protected]>

Commit d55123c080cb ("generic/247: filter out expected XFS warnings for mixed mmap/direct I/O") made generic/247 start explicitly unmounting the scratch device. However, the test doesn't actually use the scratch device, so it will fail if SCRATCH_DEV is undefined. Fix it by unmounting the test device instead.

Quoted 7 lines
Quoted 4 lines

Thanks for the fix! I found this in my review and I remembered I removed the _scratch_unmount and updated the comments accordingly at commit time, but clearly I didn't.

It was removed from generic/095 (maybe by accident?) but not generic/247. Perhaps it needs to be added back to generic/095?

You're right, I updated the wrong test.. Yeah, it should be added back to generic/095. Would you mind sending a v2 patch to do these edits all together? i.e. add _scratch_unmount (and comments) back to generic/095 and remove them from generic/247?

Thanks,
Eryu