[Cluster-devel] [PATCH 13/41] cman: drop dead code and fix code logic

[Fabio M. Di Nitto]

Spotted by Coverity Scan

Signed-off-by: Fabio M. Di Nitto <fdinitto at redhat.com>
---
:100644 100644 f4362cf... 7fb3005... M	cman/daemon/barrier.c
 cman/daemon/barrier.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/cman/daemon/barrier.c b/cman/daemon/barrier.c
index f4362cf..7fb3005 100644
--- a/cman/daemon/barrier.c
+++ b/cman/daemon/barrier.c
@@ -177,11 +177,11 @@ void process_barrier_msg(struct cl_barriermsg *msg,
 {
 	struct cl_barrier *barrier;
 
-	barrier = find_barrier(msg->name);
-
 	/* Ignore other peoples' messages */
 	if (!we_are_a_cluster_member)
 		return;
+
+	barrier = find_barrier(msg->name);
 	if (!barrier)
 		return;
 
@@ -200,8 +200,6 @@ void process_barrier_msg(struct cl_barriermsg *msg,
 		break;
 
 	case BARRIER_COMPLETE:
-		if (!barrier)
-			return;
 		/* Once we receive COMPLETE, we know that everyone has completed.
 		   I love VS */
 		barrier_complete_phase2(barrier, 0);
-- 
1.7.4.4