1 files changed, 24 insertions, 56 deletions

diff --git a/net/netrom/nr_route.c b/net/netrom/nr_route.c
index 4eb1ac9a7679..44059d0c8dd1 100644
--- a/net/netrom/nr_route.c
+++ b/net/netrom/nr_route.c
@@ -17,6 +17,7 @@
 #include <linux/string.h>
 #include <linux/sockios.h>
 #include <linux/net.h>
+#include <linux/slab.h>
 #include <net/ax25.h>
 #include <linux/inet.h>
 #include <linux/netdevice.h>
@@ -597,15 +598,15 @@ struct net_device *nr_dev_first(void)
 {
         struct net_device *dev, *first = NULL;
 
-        read_lock(&dev_base_lock);
-        for_each_netdev(&init_net, dev) {
+        rcu_read_lock();
+        for_each_netdev_rcu(&init_net, dev) {
                 if ((dev->flags & IFF_UP) && dev->type == ARPHRD_NETROM)
                         if (first == NULL || strncmp(dev->name, first->name, 3) < 0)
                                 first = dev;
         }
         if (first)
                 dev_hold(first);
-        read_unlock(&dev_base_lock);
+        rcu_read_unlock();
 
         return first;
 }
@@ -617,16 +618,17 @@ struct net_device *nr_dev_get(ax25_address *addr)
 {
         struct net_device *dev;
 
-        read_lock(&dev_base_lock);
-        for_each_netdev(&init_net, dev) {
-                if ((dev->flags & IFF_UP) && dev->type == ARPHRD_NETROM && ax25cmp(addr, (ax25_address *)dev->dev_addr) == 0) {
+        rcu_read_lock();
+        for_each_netdev_rcu(&init_net, dev) {
+                if ((dev->flags & IFF_UP) && dev->type == ARPHRD_NETROM &&
+                    ax25cmp(addr, (ax25_address *)dev->dev_addr) == 0) {
                         dev_hold(dev);
                         goto out;
                 }
         }
         dev = NULL;
 out:
-        read_unlock(&dev_base_lock);
+        rcu_read_unlock();
         return dev;
 }
 
@@ -842,12 +844,13 @@ int nr_route_frame(struct sk_buff *skb, ax25_cb *ax25)
         dptr  = skb_push(skb, 1);
         *dptr = AX25_P_NETROM;
 
-        ax25s = ax25_send_frame(skb, 256, (ax25_address *)dev->dev_addr, &nr_neigh->callsign, nr_neigh->digipeat, nr_neigh->dev);
-        if (nr_neigh->ax25 && ax25s) {
-                /* We were already holding this ax25_cb */
+        ax25s = nr_neigh->ax25;
+        nr_neigh->ax25 = ax25_send_frame(skb, 256,
+                                         (ax25_address *)dev->dev_addr,
+                                         &nr_neigh->callsign,
+                                         nr_neigh->digipeat, nr_neigh->dev);
+        if (ax25s)
                 ax25_cb_put(ax25s);
-        }
-        nr_neigh->ax25 = ax25s;
 
         dev_put(dev);
         ret = (nr_neigh->ax25 != NULL);
@@ -861,33 +864,13 @@ int nr_route_frame(struct sk_buff *skb, ax25_cb *ax25)
 
 static void *nr_node_start(struct seq_file *seq, loff_t *pos)
 {
-        struct nr_node *nr_node;
-        struct hlist_node *node;
-        int i = 1;
-
         spin_lock_bh(&nr_node_list_lock);
-        if (*pos == 0)
-                return SEQ_START_TOKEN;
-
-        nr_node_for_each(nr_node, node, &nr_node_list) {
-                if (i == *pos)
-                        return nr_node;
-                ++i;
-        }
-
-        return NULL;
+        return seq_hlist_start_head(&nr_node_list, *pos);
 }
 
 static void *nr_node_next(struct seq_file *seq, void *v, loff_t *pos)
 {
-        struct hlist_node *node;
-        ++*pos;
-
-        node = (v == SEQ_START_TOKEN)
-                ? nr_node_list.first
-                : ((struct nr_node *)v)->node_node.next;
-
-        return hlist_entry(node, struct nr_node, node_node);
+        return seq_hlist_next(v, &nr_node_list, pos);
 }
 
 static void nr_node_stop(struct seq_file *seq, void *v)
@@ -904,7 +887,9 @@ static int nr_node_show(struct seq_file *seq, void *v)
                 seq_puts(seq,
                          "callsign  mnemonic w n qual obs neigh qual obs neigh qual obs neigh\n");
         else {
-                struct nr_node *nr_node = v;
+                struct nr_node *nr_node = hlist_entry(v, struct nr_node,
+                                                      node_node);
+
                 nr_node_lock(nr_node);
                 seq_printf(seq, "%-9s %-7s  %d %d",
                         ax2asc(buf, &nr_node->callsign),
@@ -947,31 +932,13 @@ const struct file_operations nr_nodes_fops = {
 
 static void *nr_neigh_start(struct seq_file *seq, loff_t *pos)
 {
-        struct nr_neigh *nr_neigh;
-        struct hlist_node *node;
-        int i = 1;
-
         spin_lock_bh(&nr_neigh_list_lock);
-        if (*pos == 0)
-                return SEQ_START_TOKEN;
-
-        nr_neigh_for_each(nr_neigh, node, &nr_neigh_list) {
-                if (i == *pos)
-                        return nr_neigh;
-        }
-        return NULL;
+        return seq_hlist_start_head(&nr_neigh_list, *pos);
 }
 
 static void *nr_neigh_next(struct seq_file *seq, void *v, loff_t *pos)
 {
-        struct hlist_node *node;
-        ++*pos;
-
-        node = (v == SEQ_START_TOKEN)
-                ? nr_neigh_list.first
-                : ((struct nr_neigh *)v)->neigh_node.next;
-
-        return hlist_entry(node, struct nr_neigh, neigh_node);
+        return seq_hlist_next(v, &nr_neigh_list, pos);
 }
 
 static void nr_neigh_stop(struct seq_file *seq, void *v)
@@ -987,8 +954,9 @@ static int nr_neigh_show(struct seq_file *seq, void *v)
         if (v == SEQ_START_TOKEN)
                 seq_puts(seq, "addr  callsign  dev  qual lock count failed digipeaters\n");
         else {
-                struct nr_neigh *nr_neigh = v;
+                struct nr_neigh *nr_neigh;
 
+                nr_neigh = hlist_entry(v, struct nr_neigh, neigh_node);
                 seq_printf(seq, "%05d %-9s %-4s  %3d    %d   %3d    %3d",
                         nr_neigh->number,
                         ax2asc(buf, &nr_neigh->callsign),