luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tipc: convert tipc_nametbl_size type from variable to macro

Browse Source 
There is nothing changing this variable dynamically, so change
it to a macro to make that more obvious when reading the code.

Signed-off-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ying Xue 2012-08-16 12:09:11 +00:00 committed by David S. Miller
parent 379c0456af
commit f046e7d9be
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/tipc/name_table.c
View File

@ -41,7 +41,7 @@
#include "subscr.h" #include "subscr.h"
#include "port.h" #include "port.h"
static int tipc_nametbl_size = 1024; /* must be a power of 2 */ #define TIPC_NAMETBL_SIZE 1024 /* must be a power of 2 */
/** /**
* struct name_info - name sequence publication info * struct name_info - name sequence publication info
@ -114,7 +114,7 @@ DEFINE_RWLOCK(tipc_nametbl_lock);
static int hash(int x) static int hash(int x)
{ {
return x & (tipc_nametbl_size - 1); return x & (TIPC_NAMETBL_SIZE - 1);
} }
/** /**
@ -871,7 +871,7 @@ static int nametbl_list(char *buf, int len, u32 depth_info,
ret += nametbl_header(buf, len, depth); ret += nametbl_header(buf, len, depth);
lowbound = 0; lowbound = 0;
upbound = ~0; upbound = ~0;
for (i = 0; i < tipc_nametbl_size; i++) { for (i = 0; i < TIPC_NAMETBL_SIZE; i++) {
seq_head = &table.types[i]; seq_head = &table.types[i];
hlist_for_each_entry(seq, seq_node, seq_head, ns_list) { hlist_for_each_entry(seq, seq_node, seq_head, ns_list) {
ret += nameseq_list(seq, buf + ret, len - ret, ret += nameseq_list(seq, buf + ret, len - ret,
@ -935,7 +935,7 @@ struct sk_buff *tipc_nametbl_get(const void *req_tlv_area, int req_tlv_space)
int tipc_nametbl_init(void) int tipc_nametbl_init(void)
{ {
table.types = kcalloc(tipc_nametbl_size, sizeof(struct hlist_head), table.types = kcalloc(TIPC_NAMETBL_SIZE, sizeof(struct hlist_head),
GFP_ATOMIC); GFP_ATOMIC);
if (!table.types) if (!table.types)
return -ENOMEM; return -ENOMEM;
@ -953,7 +953,7 @@ void tipc_nametbl_stop(void)
/* 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++) {
if (hlist_empty(&table.types[i])) if (hlist_empty(&table.types[i]))
continue; continue;
pr_err("nametbl_stop(): orphaned hash chain detected\n"); pr_err("nametbl_stop(): orphaned hash chain detected\n");