Commit f1379173 authored by Allan Stephens's avatar Allan Stephens Committed by Paul Gortmaker
Browse files

tipc: Cosmetic changes to node subscription code 



Relocates the code that notifies users of node subscriptions so that
it is adjacent to the rest of the routines that implement TIPC's node
subscription capability. Renames the name table routine that is
invoked by a node subscription to better reflect its purpose and to
be consistent with other, similar name table routines.

These changes are cosmetic in nature, and do not alter the behavior
of TIPC.

Signed-off-by: default avatarAllan Stephens <Allan.Stephens@windriver.com>
Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
parent 431697eb

net/tipc/name_distr.c

+4 −3
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ exit: 
}



/**

 * node_is_down - remove publication associated with a failed node

 * named_purge_publ - remove publication associated with a failed node

 *

 * Invoked for each publication issued by a newly failed node.

 * Removes publication structure from name table & deletes it.
@@ -223,7 +223,7 @@ exit: 
 * publication. Nudge this item's key to distinguish it from the other.

 */



static void node_is_down(struct publication *publ)

static void named_purge_publ(struct publication *publ)

{

	struct publication *p;
@@ -269,7 +269,8 @@ void tipc_named_recv(struct sk_buff *buf) 
				tipc_nodesub_subscribe(&publ->subscr,

						       msg_orignode(msg),

						       publ,

						       (net_ev_handler)node_is_down);

						       (net_ev_handler)

						       named_purge_publ);

			}

		} else if (msg_type(msg) == WITHDRAWAL) {

			publ = tipc_nametbl_remove_publ(ntohl(item->type),

net/tipc/node.c

+1 −8
Original line number Diff line number Diff line
@@ -327,7 +327,6 @@ static void node_cleanup_finished(unsigned long node_addr) 


static void node_lost_contact(struct tipc_node *n_ptr)

{

	struct tipc_node_subscr *ns;

	char addr_string[16];

	u32 i;
@@ -365,13 +364,7 @@ static void node_lost_contact(struct tipc_node *n_ptr) 
	}



	/* Notify subscribers */

	list_for_each_entry(ns, &n_ptr->nsub, nodesub_list) {

		if (ns->handle_node_down) {

			tipc_k_signal((Handler)ns->handle_node_down,

				      (unsigned long)ns->usr_handle);

			ns->handle_node_down = NULL;

		}

	}

	tipc_nodesub_notify(n_ptr);



	/* Prevent re-contact with node until all cleanup is done */

net/tipc/node_subscr.c

+20 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 * net/tipc/node_subscr.c: TIPC "node down" subscription handling

 *

 * Copyright (c) 1995-2006, Ericsson AB

 * Copyright (c) 2005, Wind River Systems

 * Copyright (c) 2005, 2010-2011, Wind River Systems

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -76,3 +76,22 @@ void tipc_nodesub_unsubscribe(struct tipc_node_subscr *node_sub) 
	list_del_init(&node_sub->nodesub_list);

	tipc_node_unlock(node_sub->node);

}



/**

 * tipc_nodesub_notify - notify subscribers that a node is unreachable

 *

 * Note: node is locked by caller

 */



void tipc_nodesub_notify(struct tipc_node *node)

{

	struct tipc_node_subscr *ns;



	list_for_each_entry(ns, &node->nsub, nodesub_list) {

		if (ns->handle_node_down) {

			tipc_k_signal((Handler)ns->handle_node_down,

				      (unsigned long)ns->usr_handle);

			ns->handle_node_down = NULL;

		}

	}

}

net/tipc/node_subscr.h

+2 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 * net/tipc/node_subscr.h: Include file for TIPC "node down" subscription handling

 *

 * Copyright (c) 1995-2006, Ericsson AB

 * Copyright (c) 2005, Wind River Systems

 * Copyright (c) 2005, 2010-2011, Wind River Systems

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -59,5 +59,6 @@ struct tipc_node_subscr { 
void tipc_nodesub_subscribe(struct tipc_node_subscr *node_sub, u32 addr,

			    void *usr_handle, net_ev_handler handle_down);

void tipc_nodesub_unsubscribe(struct tipc_node_subscr *node_sub);

void tipc_nodesub_notify(struct tipc_node *node);



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE