From: Alasdair Kergon <agk@redhat.com>
Date: Wed, 29 Jun 2011 11:36:37 +0000 (+0000)
Subject: Remove temporary failures now, but continue to give INTERNAL_ERROR.
X-Git-Tag: v2_02_91~795
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=600dc4168c0a61ad96696b44984ce666e5b86a36;p=lvm2.git

Remove temporary failures now, but continue to give INTERNAL_ERROR.
---

diff --git a/libdm/ioctl/libdm-iface.c b/libdm/ioctl/libdm-iface.c
index 51fec9418..53604f86d 100644
--- a/libdm/ioctl/libdm-iface.c
+++ b/libdm/ioctl/libdm-iface.c
@@ -2059,7 +2059,7 @@ int dm_task_run(struct dm_task *dmt)
 	}
 
 	if ((suspended_counter = dm_get_suspended_counter()) &&
-	    dmt->type == DM_DEVICE_RELOAD) {
+	    dmt->type == DM_DEVICE_RELOAD)
 		log_error(INTERNAL_ERROR "Performing unsafe table load while %d device(s) "
 			  "are known to be suspended: "
 			  "%s%s%s %s%.0d%s%.0d%s%s",
@@ -2073,8 +2073,6 @@ int dm_task_run(struct dm_task *dmt)
 	                  dmt->minor > 0 ? dmt->minor : 0,
 	                  dmt->major > 0 && dmt->minor == 0 ? "0" : "",
 	                  dmt->major > 0 ? ") " : "");
-		return 0;
-	}
 
 	/* FIXME Detect and warn if cookie set but should not be. */
 repeat_ioctl: