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

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
...@@ -122,30 +122,59 @@ static void tipc_core_stop(void) ...@@ -122,30 +122,59 @@ static void tipc_core_stop(void)
*/ */
static int tipc_core_start(void) static int tipc_core_start(void)
{ {
int res; int err;
get_random_bytes(&tipc_random, sizeof(tipc_random)); get_random_bytes(&tipc_random, sizeof(tipc_random));
res = tipc_handler_start(); err = tipc_handler_start();
if (!res) if (err)
res = tipc_ref_table_init(tipc_max_ports, tipc_random); goto out_handler;
if (!res)
res = tipc_nametbl_init(); err = tipc_ref_table_init(tipc_max_ports, tipc_random);
if (!res) if (err)
res = tipc_netlink_start(); goto out_reftbl;
if (!res)
res = tipc_socket_init(); err = tipc_nametbl_init();
if (!res) if (err)
res = tipc_register_sysctl(); goto out_nametbl;
if (!res)
res = tipc_subscr_start(); err = tipc_netlink_start();
if (!res) if (err)
res = tipc_cfg_init(); goto out_netlink;
if (res) {
tipc_handler_stop(); err = tipc_socket_init();
tipc_core_stop(); if (err)
} goto out_socket;
return res;
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();
out_handler:
return err;
} }
static int __init tipc_init(void) static int __init tipc_init(void)
......
...@@ -945,9 +945,6 @@ void tipc_nametbl_stop(void) ...@@ -945,9 +945,6 @@ void tipc_nametbl_stop(void)
{ {
u32 i; u32 i;
if (!table.types)
return;
/* Verify name table is empty, then release it */ /* Verify name table is empty, then release it */
write_lock_bh(&tipc_nametbl_lock); write_lock_bh(&tipc_nametbl_lock);
for (i = 0; i < TIPC_NAMETBL_SIZE; i++) { for (i = 0; i < TIPC_NAMETBL_SIZE; i++) {
......
...@@ -83,8 +83,6 @@ static struct genl_ops tipc_genl_ops[] = { ...@@ -83,8 +83,6 @@ static struct genl_ops tipc_genl_ops[] = {
}, },
}; };
static int tipc_genl_family_registered;
int tipc_netlink_start(void) int tipc_netlink_start(void)
{ {
int res; int res;
...@@ -94,16 +92,10 @@ int tipc_netlink_start(void) ...@@ -94,16 +92,10 @@ int tipc_netlink_start(void)
pr_err("Failed to register netlink interface\n"); pr_err("Failed to register netlink interface\n");
return res; return res;
} }
tipc_genl_family_registered = 1;
return 0; return 0;
} }
void tipc_netlink_stop(void) void tipc_netlink_stop(void)
{ {
if (!tipc_genl_family_registered)
return;
genl_unregister_family(&tipc_genl_family); genl_unregister_family(&tipc_genl_family);
tipc_genl_family_registered = 0;
} }
...@@ -126,9 +126,6 @@ int tipc_ref_table_init(u32 requested_size, u32 start) ...@@ -126,9 +126,6 @@ int tipc_ref_table_init(u32 requested_size, u32 start)
*/ */
void tipc_ref_table_stop(void) void tipc_ref_table_stop(void)
{ {
if (!tipc_ref_table.entries)
return;
vfree(tipc_ref_table.entries); vfree(tipc_ref_table.entries);
tipc_ref_table.entries = NULL; tipc_ref_table.entries = NULL;
} }
......
...@@ -573,7 +573,6 @@ int tipc_server_start(struct tipc_server *s) ...@@ -573,7 +573,6 @@ int tipc_server_start(struct tipc_server *s)
kmem_cache_destroy(s->rcvbuf_cache); kmem_cache_destroy(s->rcvbuf_cache);
return ret; return ret;
} }
s->enabled = 1;
return ret; return ret;
} }
...@@ -583,10 +582,6 @@ void tipc_server_stop(struct tipc_server *s) ...@@ -583,10 +582,6 @@ void tipc_server_stop(struct tipc_server *s)
int total = 0; int total = 0;
int id; int id;
if (!s->enabled)
return;
s->enabled = 0;
spin_lock_bh(&s->idr_lock); spin_lock_bh(&s->idr_lock);
for (id = 0; total < s->idr_in_use; id++) { for (id = 0; total < s->idr_in_use; id++) {
con = idr_find(&s->conn_idr, id); con = idr_find(&s->conn_idr, id);
......
...@@ -56,7 +56,6 @@ ...@@ -56,7 +56,6 @@
* @name: server name * @name: server name
* @imp: message importance * @imp: message importance
* @type: socket type * @type: socket type
* @enabled: identify whether server is launched or not
*/ */
struct tipc_server { struct tipc_server {
struct idr conn_idr; struct idr conn_idr;
...@@ -74,7 +73,6 @@ struct tipc_server { ...@@ -74,7 +73,6 @@ struct tipc_server {
const char name[TIPC_SERVER_NAME_LEN]; const char name[TIPC_SERVER_NAME_LEN];
int imp; int imp;
int type; int type;
int enabled;
}; };
int tipc_conn_sendmsg(struct tipc_server *s, int conid, int tipc_conn_sendmsg(struct tipc_server *s, int conid,
......
...@@ -70,8 +70,6 @@ static const struct proto_ops msg_ops; ...@@ -70,8 +70,6 @@ static const struct proto_ops msg_ops;
static struct proto tipc_proto; static struct proto tipc_proto;
static struct proto tipc_proto_kern; static struct proto tipc_proto_kern;
static int sockets_enabled;
/* /*
* Revised TIPC socket locking policy: * Revised TIPC socket locking policy:
* *
...@@ -2027,8 +2025,6 @@ int tipc_socket_init(void) ...@@ -2027,8 +2025,6 @@ int tipc_socket_init(void)
proto_unregister(&tipc_proto); proto_unregister(&tipc_proto);
goto out; goto out;
} }
sockets_enabled = 1;
out: out:
return res; return res;
} }
...@@ -2038,10 +2034,6 @@ int tipc_socket_init(void) ...@@ -2038,10 +2034,6 @@ int tipc_socket_init(void)
*/ */
void tipc_socket_stop(void) void tipc_socket_stop(void)
{ {
if (!sockets_enabled)
return;
sockets_enabled = 0;
sock_unregister(tipc_family_ops.family); sock_unregister(tipc_family_ops.family);
proto_unregister(&tipc_proto); proto_unregister(&tipc_proto);
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment