2006-10-12 05:29:12

by Akinobu Mita

[permalink] [raw]
Subject: [PATCH] ocfs2: delete redundant memcmp()

This patch deletes redundant memcmp() while looking up in rb tree.

Cc: Mark Fasheh <[email protected]>
Cc: Kurt Hackel <[email protected]>
Signed-off-by: Akinbou Mita <[email protected]>

fs/ocfs2/cluster/nodemanager.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)

Index: work-fault-inject/fs/ocfs2/cluster/nodemanager.c
===================================================================
--- work-fault-inject.orig/fs/ocfs2/cluster/nodemanager.c
+++ work-fault-inject/fs/ocfs2/cluster/nodemanager.c
@@ -152,14 +152,16 @@ static struct o2nm_node *o2nm_node_ip_tr
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;


2006-10-12 16:28:26

by Mark Fasheh

[permalink] [raw]
Subject: Re: [PATCH] ocfs2: delete redundant memcmp()

On Thu, Oct 12, 2006 at 02:29:33PM +0900, Akinobu Mita wrote:
> This patch deletes redundant memcmp() while looking up in rb tree.
Looks good, thanks.
--Mark

--
Mark Fasheh
Senior Software Developer, Oracle
[email protected]