Commit b0c1e928 authored by Allan Stephens's avatar Allan Stephens Committed by David S. Miller
Browse files

tipc: Remove user registry subsystem 



Eliminates routines, data structures, and files that make up TIPC's
user registry. The user registry is no longer needed since the native
API routines that utilized it no longer exist and there are no longer
any internal TIPC services that use it.

Signed-off-by: default avatarAllan Stephens <Allan.Stephens@windriver.com>
Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent aa70200e

net/tipc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -8,6 +8,6 @@ tipc-y += addr.o bcast.o bearer.o config.o \ 
	   core.o handler.o link.o discover.o msg.o  \

	   name_distr.o  subscr.o name_table.o net.o  \

	   netlink.o node.o node_subscr.o port.o ref.o  \

	   socket.o user_reg.o dbg.o eth_media.o

	   socket.o dbg.o eth_media.o



# End of file

net/tipc/config.c

+1 −1
Original line number Diff line number Diff line
@@ -500,7 +500,7 @@ int tipc_cfg_init(void) 
	struct tipc_name_seq seq;

	int res;



	res = tipc_createport(0, NULL, TIPC_CRITICAL_IMPORTANCE,

	res = tipc_createport(NULL, TIPC_CRITICAL_IMPORTANCE,

			      NULL, NULL, NULL,

			      NULL, cfg_named_msg_event, NULL,

			      NULL, &config_port_ref);

net/tipc/core.c

+0 −3
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ 
#include "core.h"

#include "ref.h"

#include "net.h"

#include "user_reg.h"

#include "name_table.h"

#include "subscr.h"

#include "config.h"
@@ -144,7 +143,6 @@ static void tipc_core_stop(void) 
	tipc_handler_stop();

	tipc_cfg_stop();

	tipc_subscr_stop();

	tipc_reg_stop();

	tipc_nametbl_stop();

	tipc_ref_table_stop();

	tipc_socket_stop();
@@ -167,7 +165,6 @@ static int tipc_core_start(void) 


	if ((res = tipc_handler_start()) ||

	    (res = tipc_ref_table_init(tipc_max_ports, tipc_random)) ||

	    (res = tipc_reg_start()) ||

	    (res = tipc_nametbl_init()) ||

	    (res = tipc_k_signal((Handler)tipc_subscr_start, 0)) ||

	    (res = tipc_k_signal((Handler)tipc_cfg_init, 0)) ||

net/tipc/port.c

+2 −9
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ 
#include "config.h"

#include "port.h"

#include "name_table.h"

#include "user_reg.h"



/* Connection management: */

#define PROBING_INTERVAL 3600000	/* [ms] => 1 h */
@@ -272,7 +271,6 @@ int tipc_deleteport(u32 ref) 
		tipc_nodesub_unsubscribe(&p_ptr->subscription);

	}

	if (p_ptr->user_port) {

		tipc_reg_remove_port(p_ptr->user_port);

		kfree(p_ptr->user_port);

	}
@@ -934,12 +932,10 @@ void tipc_acknowledge(u32 ref, u32 ack) 
}



/*

 * tipc_createport(): user level call. Will add port to

 *                    registry if non-zero user_ref.

 * tipc_createport(): user level call.

 */



int tipc_createport(u32 user_ref,

		    void *usr_handle,

int tipc_createport(void *usr_handle,

		    unsigned int importance,

		    tipc_msg_err_event error_cb,

		    tipc_named_msg_err_event named_error_cb,
@@ -966,7 +962,6 @@ int tipc_createport(u32 user_ref, 
	}



	p_ptr->user_port = up_ptr;

	up_ptr->user_ref = user_ref;

	up_ptr->usr_handle = usr_handle;

	up_ptr->ref = p_ptr->publ.ref;

	up_ptr->err_cb = error_cb;
@@ -976,8 +971,6 @@ int tipc_createport(u32 user_ref, 
	up_ptr->named_msg_cb = named_msg_cb;

	up_ptr->conn_msg_cb = conn_msg_cb;

	up_ptr->continue_event_cb = continue_event_cb;

	INIT_LIST_HEAD(&up_ptr->uport_list);

	tipc_reg_add_port(up_ptr);

	*portref = p_ptr->publ.ref;

	tipc_port_unlock(p_ptr);

	return 0;

net/tipc/port.h

+1 −5
Original line number Diff line number Diff line
@@ -77,15 +77,12 @@ typedef void (*tipc_continue_event) (void *usr_handle, u32 portref); 


/**

 * struct user_port - TIPC user port (used with native API)

 * @user_ref: id of user who created user port

 * @usr_handle: user-specified field

 * @ref: object reference to associated TIPC port

 * <various callback routines>

 * @uport_list: adjacent user ports in list of ports held by user

 */



struct user_port {

	u32 user_ref;

	void *usr_handle;

	u32 ref;

	tipc_msg_err_event err_cb;
@@ -95,7 +92,6 @@ struct user_port { 
	tipc_named_msg_event named_msg_cb;

	tipc_conn_msg_event conn_msg_cb;

	tipc_continue_event continue_event_cb;

	struct list_head uport_list;

};



/**
@@ -181,7 +177,7 @@ int tipc_send_buf_fast(struct sk_buff *buf, u32 destnode); 


void tipc_acknowledge(u32 port_ref, u32 ack);



int tipc_createport(unsigned int tipc_user, void *usr_handle,

int tipc_createport(void *usr_handle,

		unsigned int importance, tipc_msg_err_event error_cb,

		tipc_named_msg_err_event named_error_cb,

		tipc_conn_shutdown_event conn_error_cb, tipc_msg_event msg_cb,

CRA Git | Maintained and supported by SUSTech CRA and CCSE