mirror of https://gitee.com/openkylin/linux.git
[TIPC]: Cleanups
This patch contains the following possible cleanups: - make needlessly global code static - #if 0 the following unused global functions: - name_table.c: tipc_nametbl_print() - name_table.c: tipc_nametbl_dump() - net.c: tipc_net_next_node() Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Per Liden <per.liden@ericsson.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Adrian Bunk
David S. Miller
parent
7c501a5960
commit
988f088a8e
|
|
@ -314,7 +314,7 @@ void tipc_bclink_check_gap(struct node *n_ptr, u32 last_sent)
|
|||
* Only tipc_net_lock set.
|
||||
*/
|
||||
|
||||
void tipc_bclink_peek_nack(u32 dest, u32 sender_tag, u32 gap_after, u32 gap_to)
|
||||
static void tipc_bclink_peek_nack(u32 dest, u32 sender_tag, u32 gap_after, u32 gap_to)
|
||||
{
|
||||
struct node *n_ptr = tipc_node_find(dest);
|
||||
u32 my_after, my_to;
|
||||
|
|
@ -425,9 +425,9 @@ void tipc_bclink_recv_pkt(struct sk_buff *buf)
|
|||
msg_bcgap_to(msg));
|
||||
} else {
|
||||
tipc_bclink_peek_nack(msg_destnode(msg),
|
||||
msg_bcast_tag(msg),
|
||||
msg_bcgap_after(msg),
|
||||
msg_bcgap_to(msg));
|
||||
msg_bcast_tag(msg),
|
||||
msg_bcgap_after(msg),
|
||||
msg_bcgap_to(msg));
|
||||
}
|
||||
buf_discard(buf);
|
||||
return;
|
||||
|
|
@ -525,9 +525,9 @@ u32 tipc_bclink_acks_missing(struct node *n_ptr)
|
|||
* Returns 0 if packet sent successfully, non-zero if not
|
||||
*/
|
||||
|
||||
int tipc_bcbearer_send(struct sk_buff *buf,
|
||||
struct tipc_bearer *unused1,
|
||||
struct tipc_media_addr *unused2)
|
||||
static int tipc_bcbearer_send(struct sk_buff *buf,
|
||||
struct tipc_bearer *unused1,
|
||||
struct tipc_media_addr *unused2)
|
||||
{
|
||||
static int send_count = 0;
|
||||
|
||||
|
|
|
|||
|
|
@ -44,8 +44,8 @@
|
|||
#include "msg.h"
|
||||
#include "bearer.h"
|
||||
|
||||
void tipc_cltr_multicast(struct cluster *c_ptr, struct sk_buff *buf,
|
||||
u32 lower, u32 upper);
|
||||
static void tipc_cltr_multicast(struct cluster *c_ptr, struct sk_buff *buf,
|
||||
u32 lower, u32 upper);
|
||||
struct sk_buff *tipc_cltr_prepare_routing_msg(u32 data_size, u32 dest);
|
||||
|
||||
struct node **tipc_local_nodes = NULL;
|
||||
|
|
@ -229,7 +229,7 @@ struct node *tipc_cltr_select_node(struct cluster *c_ptr, u32 selector)
|
|||
* Routing table management: See description in node.c
|
||||
*/
|
||||
|
||||
struct sk_buff *tipc_cltr_prepare_routing_msg(u32 data_size, u32 dest)
|
||||
static struct sk_buff *tipc_cltr_prepare_routing_msg(u32 data_size, u32 dest)
|
||||
{
|
||||
u32 size = INT_H_SIZE + data_size;
|
||||
struct sk_buff *buf = buf_acquire(size);
|
||||
|
|
@ -495,7 +495,7 @@ void tipc_cltr_remove_as_router(struct cluster *c_ptr, u32 router)
|
|||
* tipc_cltr_multicast - multicast message to local nodes
|
||||
*/
|
||||
|
||||
void tipc_cltr_multicast(struct cluster *c_ptr, struct sk_buff *buf,
|
||||
static void tipc_cltr_multicast(struct cluster *c_ptr, struct sk_buff *buf,
|
||||
u32 lower, u32 upper)
|
||||
{
|
||||
struct sk_buff *buf_copy;
|
||||
|
|
|
|||
|
|
@ -110,10 +110,10 @@ void tipc_disc_link_event(u32 addr, char *name, int up)
|
|||
* @b_ptr: ptr to bearer issuing message
|
||||
*/
|
||||
|
||||
struct sk_buff *tipc_disc_init_msg(u32 type,
|
||||
u32 req_links,
|
||||
u32 dest_domain,
|
||||
struct bearer *b_ptr)
|
||||
static struct sk_buff *tipc_disc_init_msg(u32 type,
|
||||
u32 req_links,
|
||||
u32 dest_domain,
|
||||
struct bearer *b_ptr)
|
||||
{
|
||||
struct sk_buff *buf = buf_acquire(DSC_H_SIZE);
|
||||
struct tipc_msg *msg;
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@
|
|||
#include "cluster.h"
|
||||
#include "bcast.h"
|
||||
|
||||
int tipc_nametbl_size = 1024; /* must be a power of 2 */
|
||||
static int tipc_nametbl_size = 1024; /* must be a power of 2 */
|
||||
|
||||
/**
|
||||
* struct sub_seq - container for all published instances of a name sequence
|
||||
|
|
@ -142,7 +142,7 @@ static struct publication *publ_create(u32 type, u32 lower, u32 upper,
|
|||
* tipc_subseq_alloc - allocate a specified number of sub-sequence structures
|
||||
*/
|
||||
|
||||
struct sub_seq *tipc_subseq_alloc(u32 cnt)
|
||||
static struct sub_seq *tipc_subseq_alloc(u32 cnt)
|
||||
{
|
||||
u32 sz = cnt * sizeof(struct sub_seq);
|
||||
struct sub_seq *sseq = (struct sub_seq *)kmalloc(sz, GFP_ATOMIC);
|
||||
|
|
@ -158,7 +158,7 @@ struct sub_seq *tipc_subseq_alloc(u32 cnt)
|
|||
* Allocates a single sub-sequence structure and sets it to all 0's.
|
||||
*/
|
||||
|
||||
struct name_seq *tipc_nameseq_create(u32 type, struct hlist_head *seq_head)
|
||||
static struct name_seq *tipc_nameseq_create(u32 type, struct hlist_head *seq_head)
|
||||
{
|
||||
struct name_seq *nseq =
|
||||
(struct name_seq *)kmalloc(sizeof(*nseq), GFP_ATOMIC);
|
||||
|
|
@ -243,9 +243,9 @@ static u32 nameseq_locate_subseq(struct name_seq *nseq, u32 instance)
|
|||
* tipc_nameseq_insert_publ -
|
||||
*/
|
||||
|
||||
struct publication *tipc_nameseq_insert_publ(struct name_seq *nseq,
|
||||
u32 type, u32 lower, u32 upper,
|
||||
u32 scope, u32 node, u32 port, u32 key)
|
||||
static struct publication *tipc_nameseq_insert_publ(struct name_seq *nseq,
|
||||
u32 type, u32 lower, u32 upper,
|
||||
u32 scope, u32 node, u32 port, u32 key)
|
||||
{
|
||||
struct subscription *s;
|
||||
struct subscription *st;
|
||||
|
|
@ -369,8 +369,8 @@ struct publication *tipc_nameseq_insert_publ(struct name_seq *nseq,
|
|||
* tipc_nameseq_remove_publ -
|
||||
*/
|
||||
|
||||
struct publication *tipc_nameseq_remove_publ(struct name_seq *nseq, u32 inst,
|
||||
u32 node, u32 ref, u32 key)
|
||||
static struct publication *tipc_nameseq_remove_publ(struct name_seq *nseq, u32 inst,
|
||||
u32 node, u32 ref, u32 key)
|
||||
{
|
||||
struct publication *publ;
|
||||
struct publication *prev;
|
||||
|
|
@ -983,6 +983,7 @@ static void nametbl_list(struct print_buf *buf, u32 depth_info,
|
|||
}
|
||||
}
|
||||
|
||||
#if 0
|
||||
void tipc_nametbl_print(struct print_buf *buf, const char *str)
|
||||
{
|
||||
tipc_printf(buf, str);
|
||||
|
|
@ -990,6 +991,7 @@ void tipc_nametbl_print(struct print_buf *buf, const char *str)
|
|||
nametbl_list(buf, 0, 0, 0, 0);
|
||||
read_unlock_bh(&tipc_nametbl_lock);
|
||||
}
|
||||
#endif
|
||||
|
||||
#define MAX_NAME_TBL_QUERY 32768
|
||||
|
||||
|
|
@ -1023,10 +1025,12 @@ struct sk_buff *tipc_nametbl_get(const void *req_tlv_area, int req_tlv_space)
|
|||
return buf;
|
||||
}
|
||||
|
||||
#if 0
|
||||
void tipc_nametbl_dump(void)
|
||||
{
|
||||
nametbl_list(TIPC_CONS, 0, 0, 0, 0);
|
||||
}
|
||||
#endif
|
||||
|
||||
int tipc_nametbl_init(void)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -128,13 +128,14 @@ u32 tipc_net_select_router(u32 addr, u32 ref)
|
|||
return tipc_zone_select_router(tipc_net.zones[tipc_zone(addr)], addr, ref);
|
||||
}
|
||||
|
||||
|
||||
#if 0
|
||||
u32 tipc_net_next_node(u32 a)
|
||||
{
|
||||
if (tipc_net.zones[tipc_zone(a)])
|
||||
return tipc_zone_next_node(a);
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
void tipc_net_remove_as_router(u32 router)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -214,7 +214,7 @@ int tipc_node_has_redundant_links(struct node *n_ptr)
|
|||
(n_ptr->active_links[0] != n_ptr->active_links[1]));
|
||||
}
|
||||
|
||||
int tipc_node_has_active_routes(struct node *n_ptr)
|
||||
static int tipc_node_has_active_routes(struct node *n_ptr)
|
||||
{
|
||||
return (n_ptr && (n_ptr->last_router >= 0));
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue