aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc
diff options
context:
space:
mode:
authorAllan Stephens <allan.stephens@windriver.com>2012-04-17 17:57:52 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2012-04-18 09:36:02 -0400
commit3f8375fee30cbf7fb0bd67f044e3406daa16fa3e (patch)
tree677453d1143554978ce527483a468f5098f8a9ab /net/tipc
parent798ec84d45754403571d6387396236e877965c5a (diff)
tipc: introduce publication lists struct
There is currently a single list that is containing both cluster-scope and zone-scope publications, and the list count is a separate free floating variable. Create a struct to bind the count to the list, and to pave the way for factoring out the publications into zone/cluster/node scope. The current "publ_root" most matches what will be the cluster scope list, so it is named accordingly in this commit. Signed-off-by: Allan Stephens <allan.stephens@windriver.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'net/tipc')
-rw-r--r--net/tipc/name_distr.c27
1 files changed, 17 insertions, 10 deletions
diff --git a/net/tipc/name_distr.c b/net/tipc/name_distr.c
index d57da6159616..870a001131c6 100644
--- a/net/tipc/name_distr.c
+++ b/net/tipc/name_distr.c
@@ -68,12 +68,19 @@ struct distr_item {
68}; 68};
69 69
70/** 70/**
71 * List of externally visible publications by this node -- 71 * struct publ_list - list of publications made by this node
72 * that is, all publications having scope > TIPC_NODE_SCOPE. 72 * @list: circular list of publications
73 * @list_size: number of entries in list
73 */ 74 */
75struct publ_list {
76 struct list_head list;
77 u32 size;
78};
74 79
75static LIST_HEAD(publ_root); 80static struct publ_list publ_cluster = {
76static u32 publ_cnt; 81 .list = LIST_HEAD_INIT(publ_cluster.list),
82 .size = 0,
83};
77 84
78/** 85/**
79 * publ_to_item - add publication info to a publication message 86 * publ_to_item - add publication info to a publication message
@@ -132,8 +139,8 @@ void tipc_named_publish(struct publication *publ)
132 struct sk_buff *buf; 139 struct sk_buff *buf;
133 struct distr_item *item; 140 struct distr_item *item;
134 141
135 list_add_tail(&publ->local_list, &publ_root); 142 list_add_tail(&publ->local_list, &publ_cluster.list);
136 publ_cnt++; 143 publ_cluster.size++;
137 144
138 buf = named_prepare_buf(PUBLICATION, ITEM_SIZE, 0); 145 buf = named_prepare_buf(PUBLICATION, ITEM_SIZE, 0);
139 if (!buf) { 146 if (!buf) {
@@ -156,7 +163,7 @@ void tipc_named_withdraw(struct publication *publ)
156 struct distr_item *item; 163 struct distr_item *item;
157 164
158 list_del(&publ->local_list); 165 list_del(&publ->local_list);
159 publ_cnt--; 166 publ_cluster.size--;
160 167
161 buf = named_prepare_buf(WITHDRAWAL, ITEM_SIZE, 0); 168 buf = named_prepare_buf(WITHDRAWAL, ITEM_SIZE, 0);
162 if (!buf) { 169 if (!buf) {
@@ -207,9 +214,9 @@ void tipc_named_node_up(unsigned long nodearg)
207 INIT_LIST_HEAD(&message_list); 214 INIT_LIST_HEAD(&message_list);
208 215
209 read_lock_bh(&tipc_nametbl_lock); 216 read_lock_bh(&tipc_nametbl_lock);
210 rest = publ_cnt * ITEM_SIZE; 217 rest = publ_cluster.size * ITEM_SIZE;
211 218
212 list_for_each_entry(publ, &publ_root, local_list) { 219 list_for_each_entry(publ, &publ_cluster.list, local_list) {
213 if (!buf) { 220 if (!buf) {
214 left = (rest <= max_item_buf) ? rest : max_item_buf; 221 left = (rest <= max_item_buf) ? rest : max_item_buf;
215 rest -= left; 222 rest -= left;
@@ -329,7 +336,7 @@ void tipc_named_reinit(void)
329 336
330 write_lock_bh(&tipc_nametbl_lock); 337 write_lock_bh(&tipc_nametbl_lock);
331 338
332 list_for_each_entry(publ, &publ_root, local_list) 339 list_for_each_entry(publ, &publ_cluster.list, local_list)
333 publ->node = tipc_own_addr; 340 publ->node = tipc_own_addr;
334 341
335 write_unlock_bh(&tipc_nametbl_lock); 342 write_unlock_bh(&tipc_nametbl_lock);