Commit 9fe7ed47 authored by Ying Xue's avatar Ying Xue Committed by David S. Miller
Browse files

tipc: remove all enabled flags from all tipc components 



When tipc module is inserted, many tipc components are initialized
one by one. During the initialization period, if one of them is
failed, tipc_core_stop() will be called to stop all components
whatever corresponding components are created or not. To avoid to
release uncreated ones, relevant components have to add necessary
enabled flags indicating whether they are created or not.

But in the initialization stage, if one component is unsuccessfully
created, we will just destroy successfully created components before
the failed component instead of all components. All enabled flags
defined in components, in turn, become redundant. Additionally it's
also unnecessary to identify whether table.types is NULL in
tipc_nametbl_stop() because name stable has been definitely created
successfully when tipc_nametbl_stop() is called.

Cc: Jon Maloy <jon.maloy@ericsson.com>
Cc: Erik Hugne <erik.hugne@ericsson.com>
Signed-off-by: default avatarYing Xue <ying.xue@windriver.com>
Reviewed-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7cce3b75

net/tipc/core.c

+50 −21
Original line number Diff line number Diff line
@@ -122,30 +122,59 @@ static void tipc_core_stop(void) 
 */

static int tipc_core_start(void)

{

	int res;

	int err;



	get_random_bytes(&tipc_random, sizeof(tipc_random));



	res = tipc_handler_start();

	if (!res)

		res = tipc_ref_table_init(tipc_max_ports, tipc_random);

	if (!res)

		res = tipc_nametbl_init();

	if (!res)

		res = tipc_netlink_start();

	if (!res)

		res = tipc_socket_init();

	if (!res)

		res = tipc_register_sysctl();

	if (!res)

		res = tipc_subscr_start();

	if (!res)

		res = tipc_cfg_init();

	if (res) {

	err = tipc_handler_start();

	if (err)

		goto out_handler;



	err = tipc_ref_table_init(tipc_max_ports, tipc_random);

	if (err)

		goto out_reftbl;



	err = tipc_nametbl_init();

	if (err)

		goto out_nametbl;



	err = tipc_netlink_start();

	if (err)

		goto out_netlink;



	err = tipc_socket_init();

	if (err)

		goto out_socket;



	err = tipc_register_sysctl();

	if (err)

		goto out_sysctl;



	err = tipc_subscr_start();

	if (err)

		goto out_subscr;



	err = tipc_cfg_init();

	if (err)

		goto out_cfg;



	return 0;

out_cfg:

	tipc_subscr_stop();

out_subscr:

	tipc_unregister_sysctl();

out_sysctl:

	tipc_socket_stop();

out_socket:

	tipc_netlink_stop();

out_netlink:

	tipc_nametbl_stop();

out_nametbl:

	tipc_ref_table_stop();

out_reftbl:

	tipc_handler_stop();

		tipc_core_stop();

	}

	return res;

out_handler:

	return err;

}



static int __init tipc_init(void)

net/tipc/name_table.c

+0 −3
Original line number Diff line number Diff line
@@ -945,9 +945,6 @@ void tipc_nametbl_stop(void) 
{

	u32 i;



	if (!table.types)

		return;



	/* Verify name table is empty, then release it */

	write_lock_bh(&tipc_nametbl_lock);

	for (i = 0; i < TIPC_NAMETBL_SIZE; i++) {

net/tipc/netlink.c

+0 −8
Original line number Diff line number Diff line
@@ -83,8 +83,6 @@ static struct genl_ops tipc_genl_ops[] = { 
	},

};



static int tipc_genl_family_registered;



int tipc_netlink_start(void)

{

	int res;
@@ -94,16 +92,10 @@ int tipc_netlink_start(void) 
		pr_err("Failed to register netlink interface\n");

		return res;

	}



	tipc_genl_family_registered = 1;

	return 0;

}



void tipc_netlink_stop(void)

{

	if (!tipc_genl_family_registered)

		return;



	genl_unregister_family(&tipc_genl_family);

	tipc_genl_family_registered = 0;

}

net/tipc/ref.c

+0 −3
Original line number Diff line number Diff line
@@ -126,9 +126,6 @@ int tipc_ref_table_init(u32 requested_size, u32 start) 
 */

void tipc_ref_table_stop(void)

{

	if (!tipc_ref_table.entries)

		return;



	vfree(tipc_ref_table.entries);

	tipc_ref_table.entries = NULL;

}

net/tipc/server.c

+0 −5
Original line number Diff line number Diff line
@@ -573,7 +573,6 @@ int tipc_server_start(struct tipc_server *s) 
		kmem_cache_destroy(s->rcvbuf_cache);

		return ret;

	}

	s->enabled = 1;

	return ret;

}
@@ -583,10 +582,6 @@ void tipc_server_stop(struct tipc_server *s) 
	int total = 0;

	int id;



	if (!s->enabled)

		return;



	s->enabled = 0;

	spin_lock_bh(&s->idr_lock);

	for (id = 0; total < s->idr_in_use; id++) {

		con = idr_find(&s->conn_idr, id);

CRA Git | Maintained and supported by SUSTech CRA and CCSE