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

tipc: eliminate redundant code with kfree_skb_list routine

sk_buff lists are currently relased by looping over the list and
explicitly releasing each buffer.

We replace all occurrences of this loop with a call to kfree_skb_list().
Signed-off-by: default avatarYing Xue <ying.xue@windriver.com>
Reviewed-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarJon Maloy <jon.maloy@ericsson.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4ba3f99a
...@@ -386,14 +386,7 @@ void tipc_link_wakeup_ports(struct tipc_link *l_ptr, int all) ...@@ -386,14 +386,7 @@ void tipc_link_wakeup_ports(struct tipc_link *l_ptr, int all)
*/ */
static void link_release_outqueue(struct tipc_link *l_ptr) static void link_release_outqueue(struct tipc_link *l_ptr)
{ {
struct sk_buff *buf = l_ptr->first_out; kfree_skb_list(l_ptr->first_out);
struct sk_buff *next;
while (buf) {
next = buf->next;
kfree_skb(buf);
buf = next;
}
l_ptr->first_out = NULL; l_ptr->first_out = NULL;
l_ptr->out_queue_size = 0; l_ptr->out_queue_size = 0;
} }
...@@ -415,32 +408,15 @@ void tipc_link_reset_fragments(struct tipc_link *l_ptr) ...@@ -415,32 +408,15 @@ void tipc_link_reset_fragments(struct tipc_link *l_ptr)
*/ */
void tipc_link_stop(struct tipc_link *l_ptr) void tipc_link_stop(struct tipc_link *l_ptr)
{ {
struct sk_buff *buf; kfree_skb_list(l_ptr->oldest_deferred_in);
struct sk_buff *next; kfree_skb_list(l_ptr->first_out);
buf = l_ptr->oldest_deferred_in;
while (buf) {
next = buf->next;
kfree_skb(buf);
buf = next;
}
buf = l_ptr->first_out;
while (buf) {
next = buf->next;
kfree_skb(buf);
buf = next;
}
tipc_link_reset_fragments(l_ptr); tipc_link_reset_fragments(l_ptr);
kfree_skb(l_ptr->proto_msg_queue); kfree_skb(l_ptr->proto_msg_queue);
l_ptr->proto_msg_queue = NULL; l_ptr->proto_msg_queue = NULL;
} }
void tipc_link_reset(struct tipc_link *l_ptr) void tipc_link_reset(struct tipc_link *l_ptr)
{ {
struct sk_buff *buf;
u32 prev_state = l_ptr->state; u32 prev_state = l_ptr->state;
u32 checkpoint = l_ptr->next_in_no; u32 checkpoint = l_ptr->next_in_no;
int was_active_link = tipc_link_is_active(l_ptr); int was_active_link = tipc_link_is_active(l_ptr);
...@@ -471,12 +447,7 @@ void tipc_link_reset(struct tipc_link *l_ptr) ...@@ -471,12 +447,7 @@ void tipc_link_reset(struct tipc_link *l_ptr)
link_release_outqueue(l_ptr); link_release_outqueue(l_ptr);
kfree_skb(l_ptr->proto_msg_queue); kfree_skb(l_ptr->proto_msg_queue);
l_ptr->proto_msg_queue = NULL; l_ptr->proto_msg_queue = NULL;
buf = l_ptr->oldest_deferred_in; kfree_skb_list(l_ptr->oldest_deferred_in);
while (buf) {
struct sk_buff *next = buf->next;
kfree_skb(buf);
buf = next;
}
if (!list_empty(&l_ptr->waiting_ports)) if (!list_empty(&l_ptr->waiting_ports))
tipc_link_wakeup_ports(l_ptr, 1); tipc_link_wakeup_ports(l_ptr, 1);
...@@ -1124,10 +1095,7 @@ static int link_send_sections_long(struct tipc_port *sender, ...@@ -1124,10 +1095,7 @@ static int link_send_sections_long(struct tipc_port *sender,
if (copy_from_user(buf->data + fragm_crs, sect_crs, sz)) { if (copy_from_user(buf->data + fragm_crs, sect_crs, sz)) {
res = -EFAULT; res = -EFAULT;
error: error:
for (; buf_chain; buf_chain = buf) { kfree_skb_list(buf_chain);
buf = buf_chain->next;
kfree_skb(buf_chain);
}
return res; return res;
} }
sect_crs += sz; sect_crs += sz;
...@@ -1177,18 +1145,12 @@ static int link_send_sections_long(struct tipc_port *sender, ...@@ -1177,18 +1145,12 @@ static int link_send_sections_long(struct tipc_port *sender,
if (l_ptr->max_pkt < max_pkt) { if (l_ptr->max_pkt < max_pkt) {
sender->max_pkt = l_ptr->max_pkt; sender->max_pkt = l_ptr->max_pkt;
tipc_node_unlock(node); tipc_node_unlock(node);
for (; buf_chain; buf_chain = buf) { kfree_skb_list(buf_chain);
buf = buf_chain->next;
kfree_skb(buf_chain);
}
goto again; goto again;
} }
} else { } else {
reject: reject:
for (; buf_chain; buf_chain = buf) { kfree_skb_list(buf_chain);
buf = buf_chain->next;
kfree_skb(buf_chain);
}
return tipc_port_reject_sections(sender, hdr, msg_sect, return tipc_port_reject_sections(sender, hdr, msg_sect,
len, TIPC_ERR_NO_NODE); len, TIPC_ERR_NO_NODE);
} }
...@@ -2283,11 +2245,7 @@ static int link_send_long_buf(struct tipc_link *l_ptr, struct sk_buff *buf) ...@@ -2283,11 +2245,7 @@ static int link_send_long_buf(struct tipc_link *l_ptr, struct sk_buff *buf)
fragm = tipc_buf_acquire(fragm_sz + INT_H_SIZE); fragm = tipc_buf_acquire(fragm_sz + INT_H_SIZE);
if (fragm == NULL) { if (fragm == NULL) {
kfree_skb(buf); kfree_skb(buf);
while (buf_chain) { kfree_skb_list(buf_chain);
buf = buf_chain;
buf_chain = buf_chain->next;
kfree_skb(buf);
}
return -ENOMEM; return -ENOMEM;
} }
msg_set_size(&fragm_hdr, fragm_sz + INT_H_SIZE); msg_set_size(&fragm_hdr, fragm_sz + INT_H_SIZE);
......
...@@ -291,11 +291,7 @@ static void node_lost_contact(struct tipc_node *n_ptr) ...@@ -291,11 +291,7 @@ static void node_lost_contact(struct tipc_node *n_ptr)
/* Flush broadcast link info associated with lost node */ /* Flush broadcast link info associated with lost node */
if (n_ptr->bclink.recv_permitted) { if (n_ptr->bclink.recv_permitted) {
while (n_ptr->bclink.deferred_head) { kfree_skb_list(n_ptr->bclink.deferred_head);
struct sk_buff *buf = n_ptr->bclink.deferred_head;
n_ptr->bclink.deferred_head = buf->next;
kfree_skb(buf);
}
n_ptr->bclink.deferred_size = 0; n_ptr->bclink.deferred_size = 0;
if (n_ptr->bclink.reasm_head) { if (n_ptr->bclink.reasm_head) {
......
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