[Cluster-devel] [PATCH 18/41] cman: move check of null at beginning

["Fabio M. Di Nitto" <fdinitto redhat com>]

Spotted by Coverity Scan

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

diff --git a/cman/daemon/barrier.c b/cman/daemon/barrier.c
index 7fb3005..37283ba 100644
--- a/cman/daemon/barrier.c
+++ b/cman/daemon/barrier.c
@@ -256,7 +256,7 @@ static int barrier_setattr_enabled(struct cl_barrier *barrier,
 	int status;
 
 	/* Can't disable a barrier */
-	if (!arg) {
+	if ((!barrier) || (!arg)) {
 		return -EINVAL;
 	}
 
@@ -285,7 +285,7 @@ static int barrier_setattr_enabled(struct cl_barrier *barrier,
 			return status;
 		}
 	}
-	if (barrier && barrier->state == BARRIER_STATE_COMPLETE) {
+	if (barrier->state == BARRIER_STATE_COMPLETE) {
 		return barrier->endreason;
 	}
 	return 0;	/* Nothing to propogate */
-- 
1.7.4.4