From 4bc52b7cedb0fab9c76f2712fbb947c632b7fad5 Mon Sep 17 00:00:00 2001
From: Akinobu Mita <akinobu.mita@gmail.com>
Date: Thu, 12 Oct 2006 14:29:33 +0900
Subject: [PATCH] --- yaml --- r: 40092 b: refs/heads/master c:
 79cd22d3ac921b9209bf813c7e75e6b69e74896c h: refs/heads/master v: v3

---
 [refs]                               |  2 +-
 trunk/fs/ocfs2/cluster/nodemanager.c | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 94ca6bea7ab5..c67da4023675 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1877fb2967ec8c0c6e946cc24c253bb52ce4d06
+refs/heads/master: 79cd22d3ac921b9209bf813c7e75e6b69e74896c
diff --git a/trunk/fs/ocfs2/cluster/nodemanager.c b/trunk/fs/ocfs2/cluster/nodemanager.c
index e1fceb8aa32d..d11753c50bc1 100644
--- a/trunk/fs/ocfs2/cluster/nodemanager.c
+++ b/trunk/fs/ocfs2/cluster/nodemanager.c
@@ -152,14 +152,16 @@ static struct o2nm_node *o2nm_node_ip_tree_lookup(struct o2nm_cluster *cluster,
 	struct o2nm_node *node, *ret = NULL;
 
 	while (*p) {
+		int cmp;
+
 		parent = *p;
 		node = rb_entry(parent, struct o2nm_node, nd_ip_node);
 
-		if (memcmp(&ip_needle, &node->nd_ipv4_address,
-		           sizeof(ip_needle)) < 0)
+		cmp = memcmp(&ip_needle, &node->nd_ipv4_address,
+				sizeof(ip_needle));
+		if (cmp < 0)
 			p = &(*p)->rb_left;
-		else if (memcmp(&ip_needle, &node->nd_ipv4_address,
-			        sizeof(ip_needle)) > 0)
+		else if (cmp > 0)
 			p = &(*p)->rb_right;
 		else {
 			ret = node;