tipc: move code for resetting links from bearer.c to link.c

We break out the code for resetting attached links in the
function tipc_reset_bearer(), and define a new function named
tipc_link_reset_list() to do this job.

This commit incurs no functional changes, but makes the code
of function tipc_reset_bearer() cleaner. It is also a preparation
for a more important change to the bearer code, in a subsequent
commit in this series.

Signed-off-by: Ying Xue <ying.xue@windriver.com>
Reviewed-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c
index a38c89969c686128df1a556598b248a70eec665f..a3bdf5c7f085723b97cae9a6fe3b489ebf577d8b 100644 (file)
--- a/net/tipc/bearer.c
+++ b/net/tipc/bearer.c
@@ -350,19 +350,10 @@ exit:
  */
 static int tipc_reset_bearer(struct tipc_bearer *b_ptr)
 {
-       struct tipc_link *l_ptr;
-       struct tipc_link *temp_l_ptr;
-
        read_lock_bh(&tipc_net_lock);
        pr_info("Resetting bearer <%s>\n", b_ptr->name);
        spin_lock_bh(&b_ptr->lock);
-       list_for_each_entry_safe(l_ptr, temp_l_ptr, &b_ptr->links, link_list) {
-               struct tipc_node *n_ptr = l_ptr->owner;
-
-               spin_lock_bh(&n_ptr->lock);
-               tipc_link_reset(l_ptr);
-               spin_unlock_bh(&n_ptr->lock);
-       }
+       tipc_link_reset_list(b_ptr);
        spin_unlock_bh(&b_ptr->lock);
        read_unlock_bh(&tipc_net_lock);
        return 0;

diff --git a/net/tipc/link.c b/net/tipc/link.c
index 17fbd15fcad894158134e35172ebb3b20bbfd860..3ff34e8a37d7f4e67abd854233360d84e3ab921e 100644 (file)
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -461,6 +461,18 @@ void tipc_link_reset(struct tipc_link *l_ptr)
        link_reset_statistics(l_ptr);
 }
 
+void tipc_link_reset_list(struct tipc_bearer *b_ptr)
+{
+       struct tipc_link *l_ptr;
+
+       list_for_each_entry(l_ptr, &b_ptr->links, link_list) {
+               struct tipc_node *n_ptr = l_ptr->owner;
+
+               spin_lock_bh(&n_ptr->lock);
+               tipc_link_reset(l_ptr);
+               spin_unlock_bh(&n_ptr->lock);
+       }
+}
 
 static void link_activate(struct tipc_link *l_ptr)
 {

diff --git a/net/tipc/link.h b/net/tipc/link.h
index 8addc5ec5fc6f413742320c13d656af60dfd4f3d..73beecb369e246bbdd595fcb21c8ff63d7b81544 100644 (file)
--- a/net/tipc/link.h
+++ b/net/tipc/link.h
@@ -231,6 +231,7 @@ struct sk_buff *tipc_link_cmd_show_stats(const void *req_tlv_area,
 struct sk_buff *tipc_link_cmd_reset_stats(const void *req_tlv_area,
                                          int req_tlv_space);
 void tipc_link_reset(struct tipc_link *l_ptr);
+void tipc_link_reset_list(struct tipc_bearer *b_ptr);
 int tipc_link_send(struct sk_buff *buf, u32 dest, u32 selector);
 void tipc_link_send_names(struct list_head *message_list, u32 dest);
 int tipc_link_send_buf(struct tipc_link *l_ptr, struct sk_buff *buf);