rgmanager: master - rgmanager: Fix bad assertion

Fabio M. Di Nitto fabbione at fedoraproject.org
Thu Oct 22 05:31:22 UTC 2009


Gitweb:        http://git.fedorahosted.org/git/rgmanager.git?p=rgmanager.git;a=commitdiff;h=27e5a1b243b38e955d4d9a49e5a3f43d5f0bc1b1
Commit:        27e5a1b243b38e955d4d9a49e5a3f43d5f0bc1b1
Parent:        66ce9f84a4634282968cd8a4e2bb4dbe19a5844a
Author:        Lon Hohberger <lhh at redhat.com>
AuthorDate:    Wed Oct 21 15:42:10 2009 -0400
Committer:     Fabio M. Di Nitto <fdinitto at redhat.com>
CommitterDate: Thu Oct 22 07:31:14 2009 +0200

rgmanager: Fix bad assertion

Signed-off-by: Lon Hohberger <lhh at redhat.com>
---
 rgmanager/src/daemons/restree.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/rgmanager/src/daemons/restree.c b/rgmanager/src/daemons/restree.c
index 226d05d..e064db3 100644
--- a/rgmanager/src/daemons/restree.c
+++ b/rgmanager/src/daemons/restree.c
@@ -1378,8 +1378,9 @@ _res_op_internal(resource_node_t __attribute__ ((unused)) **tree,
 		   incarnations there are. */
 		pthread_mutex_lock(&node->rn_resource->r_mutex);
 		if (node->rn_state == RES_STARTED) {
-			assert(node->rn_resource->r_incarnations > 0);
-			--node->rn_resource->r_incarnations;
+			assert(node->rn_resource->r_incarnations >= 0);
+			if (node->rn_resource->r_incarnations > 0)
+				--node->rn_resource->r_incarnations;
 		}
 
 		node->rn_flags &= ~RF_NEEDSTOP;


More information about the cluster-commits mailing list