[v2] common: make sure dm device is all settled before removing it

Commit Message

Eryu Guan March 24, 2016, 1:25 p.m. UTC

_dmerror_cleanup()/_cleanup_flakey may fail to remove dm device due to
EBUSY and cause subsequent tests to fail.

Fix it by calling $UDEV_SETTLE_PROG before remove dm device to make sure
no one is using it.

Reviewed-by: Filipe Manana <[e-mail]>
Signed-off-by: Eryu Guan <[e-mail]>
---

v2:
- fix _cleanup_flakey() as well, thanks to Filipe for pointing it out

 common/dmerror  | 3 +++
 common/dmflakey | 3 +++
 2 files changed, 6 insertions(+)

Patch

diff --git a/common/dmerror b/common/dmerror
index 004530d..5d2c1b6 100644
--- a/common/dmerror
+++ b/common/dmerror
@@ -54,6 +54,9 @@  _dmerror_unmount()
 _dmerror_cleanup()
 {
 	$UMOUNT_PROG $SCRATCH_MNT > /dev/null 2>&1
+	# wait for device to be fully settled so that 'dmsetup remove' doesn't
+	# fail due to EBUSY
+	$UDEV_SETTLE_PROG >/dev/null 2>&1
 	$DMSETUP_PROG remove error-test > /dev/null 2>&1
 }
 
diff --git a/common/dmflakey b/common/dmflakey
index 3b6521a..4434307 100644
--- a/common/dmflakey
+++ b/common/dmflakey
@@ -54,6 +54,9 @@  _cleanup_flakey()
 	# otherwise the umount will hang
 	$DMSETUP_PROG resume flakey-test > /dev/null 2>&1
 	$UMOUNT_PROG $SCRATCH_MNT > /dev/null 2>&1
+	# wait for device to be fully settled so that 'dmsetup remove' doesn't
+	# fail due to EBUSY
+	$UDEV_SETTLE_PROG >/dev/null 2>&1
 	$DMSETUP_PROG remove flakey-test > /dev/null 2>&1
 	$DMSETUP_PROG mknodes > /dev/null 2>&1
 }