[SSI] openssi/kernel/cluster/ssi/net ipvs_ssisys.c,1.12,1.13

Update of /cvsroot/ssic-linux/openssi/kernel/cluster/ssi/net
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv8882/cluster/ssi/net

Modified Files:
      Tag: OPENSSI-FC
	ipvs_ssisys.c 
Log Message:
_ipvs_add_entry: remove unused code.
_ipvs_del_entry: remove unused code.


Index: ipvs_ssisys.c
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/kernel/cluster/ssi/net/ipvs_ssisys.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- ipvs_ssisys.c	27 Oct 2009 03:18:29 -0000	1.12
+++ ipvs_ssisys.c	18 Dec 2013 07:31:55 -0000	1.13
@@ -74,22 +74,9 @@
 {
 	int retval;
 
-	BUG_ON(node == this_node);
-
-	if (node == this_node) {
-		/* This node is the director node for the CVIP */
-		/* Should we handle the return of this function */
-		/* I guess we are not interested in that ??? */
-		(void) ripvs_add_entry(node, &retval, cvip, port, rip,
-				weight, protocol, lvs_sched,
-				strlen(lvs_sched));
-
-	} else {
-		(void) RIPVS_ADD_ENTRY(node, &retval, cvip, port, rip,
+	(void) RIPVS_ADD_ENTRY(node, &retval, cvip, port, rip,
 				weight, protocol, lvs_sched,
 				strlen(lvs_sched));
-	}
-
 	return retval;
 }
 
@@ -101,7 +88,7 @@
 	extern void local_ipvs_add_entry(struct ipvs_dirinfo *, int *, u_short,
 			u_int, int, u_short, char *);
 
-	if (info->dnode == this_node)
+	if (__is_master_director(info))
 		local_ipvs_add_entry(info, &retval, port, rip, weight,
 				protocol, lvs_sched);
 	else
@@ -117,18 +104,7 @@
 {
 	int retval;
 
-	BUG_ON(node == this_node);
-
-	if (node == this_node) {
-		/* This node is the director node for the CVIP */
-		/* Should we handle the return of this function */
-		/* I guess we are not interested in that ??? */
-		(void) ripvs_del_entry(node, &retval, cvip, port, rip, protocol);
-
-	} else {
-		(void) RIPVS_DEL_ENTRY(node, &retval, cvip, port, rip, protocol);
-	}
-
+	(void) RIPVS_DEL_ENTRY(node, &retval, cvip, port, rip, protocol);
 	return retval;
 }
 
@@ -140,7 +116,7 @@
 	extern void local_ipvs_del_entry(struct ipvs_dirinfo *, int *, u_short,
 			u_int, u_short);
 
-	if (info->dnode == this_node)
+	if (__is_master_director(info))
 		local_ipvs_del_entry(info, &retval, port, rip, protocol);
 	else
 		(void) RIPVS_DEL_ENTRY(info->dnode, &retval, info->daddr,


------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT 
organizations don't have a clear picture of how application performance 
affects their revenue. With AppDynamics, you get 100% visibility into your 
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk