diff mbox

[2/7] devmapper: do not call dm_udev_complete if dm_task_set_cookie() failed

Message ID 1462791185-2903-3-git-send-email-hare@suse.de (mailing list archive)
State Not Applicable, archived
Delegated to: Mike Snitzer
Headers show

Commit Message

Hannes Reinecke May 9, 2016, 10:53 a.m. UTC 
As per Benjamin Marzinski libdevice-mapper will take care of cleaning
up the cookie for us.
So there's no need to call dm_udev_complete() if dm_task_set_cookie()
fails.

Signed-off-by: Hannes Reinecke <hare@suse.com>
---
 libmultipath/devmapper.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
diff mbox

Patch

diff --git a/libmultipath/devmapper.c b/libmultipath/devmapper.c
index 2ac62a5..8a89f46 100644
--- a/libmultipath/devmapper.c
+++ b/libmultipath/devmapper.c
@@ -232,10 +232,9 @@  dm_simplecmd (int task, const char *name, int no_flush, int need_sync, uint16_t
 #endif
 	if (udev_wait_flag &&
 	    !dm_task_set_cookie(dmt, &cookie,
-				DM_UDEV_DISABLE_LIBRARY_FALLBACK | udev_flags)) {
-		dm_udev_complete(cookie);
+				DM_UDEV_DISABLE_LIBRARY_FALLBACK | udev_flags))
 		goto out;
-	}
+
 	r = dm_task_run (dmt);
 
 	if (udev_wait_flag) {
@@ -320,10 +319,9 @@  dm_addmap (int task, const char *target, struct multipath *mpp,
 
 	if (task == DM_DEVICE_CREATE &&
 	    !dm_task_set_cookie(dmt, &cookie,
-				DM_UDEV_DISABLE_LIBRARY_FALLBACK)) {
-		dm_udev_complete(cookie);
+				DM_UDEV_DISABLE_LIBRARY_FALLBACK))
 		goto freeout;
-	}
+
 	r = dm_task_run (dmt);
 
 	if (task == DM_DEVICE_CREATE) {