Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[deliverable/linux.git] / net / batman-adv / distributed-arp-table.c

diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c
index 017fffe9a5b8d125d3f1f2ec9ffa1e964767891c..e96d7c745b4a1de6444284f38207ed599925ac2e 100644 (file)
--- a/net/batman-adv/distributed-arp-table.c
+++ b/net/batman-adv/distributed-arp-table.c
@@ -30,6 +30,7 @@
 #include <linux/in.h>
 #include <linux/jiffies.h>
 #include <linux/kernel.h>
+#include <linux/kref.h>
 #include <linux/list.h>
 #include <linux/rculist.h>
 #include <linux/rcupdate.h>
@@ -62,14 +63,27 @@ static void batadv_dat_start_timer(struct batadv_priv *bat_priv)
 }
 
 /**
- * batadv_dat_entry_free_ref - decrement the dat_entry refcounter and possibly
- * free it
- * @dat_entry: the entry to free
+ * batadv_dat_entry_release - release dat_entry from lists and queue for free
+ *  after rcu grace period
+ * @ref: kref pointer of the dat_entry
  */
-static void batadv_dat_entry_free_ref(struct batadv_dat_entry *dat_entry)
+static void batadv_dat_entry_release(struct kref *ref)
 {
-       if (atomic_dec_and_test(&dat_entry->refcount))
-               kfree_rcu(dat_entry, rcu);
+       struct batadv_dat_entry *dat_entry;
+
+       dat_entry = container_of(ref, struct batadv_dat_entry, refcount);
+
+       kfree_rcu(dat_entry, rcu);
+}
+
+/**
+ * batadv_dat_entry_put - decrement the dat_entry refcounter and possibly
+ *  release it
+ * @dat_entry: dat_entry to be free'd
+ */
+static void batadv_dat_entry_put(struct batadv_dat_entry *dat_entry)
+{
+       kref_put(&dat_entry->refcount, batadv_dat_entry_release);
 }
 
 /**
@@ -121,7 +135,7 @@ static void __batadv_dat_purge(struct batadv_priv *bat_priv,
                                continue;
 
                        hlist_del_rcu(&dat_entry->hash_entry);
-                       batadv_dat_entry_free_ref(dat_entry);
+                       batadv_dat_entry_put(dat_entry);
                }
                spin_unlock_bh(list_lock);
        }
@@ -281,7 +295,7 @@ batadv_dat_entry_hash_find(struct batadv_priv *bat_priv, __be32 ip,
                if (dat_entry->ip != ip)
                        continue;
 
-               if (!atomic_inc_not_zero(&dat_entry->refcount))
+               if (!kref_get_unless_zero(&dat_entry->refcount))
                        continue;
 
                dat_entry_tmp = dat_entry;
@@ -326,7 +340,8 @@ static void batadv_dat_entry_add(struct batadv_priv *bat_priv, __be32 ip,
        dat_entry->vid = vid;
        ether_addr_copy(dat_entry->mac_addr, mac_addr);
        dat_entry->last_update = jiffies;
-       atomic_set(&dat_entry->refcount, 2);
+       kref_init(&dat_entry->refcount);
+       kref_get(&dat_entry->refcount);
 
        hash_added = batadv_hash_add(bat_priv->dat.hash, batadv_compare_dat,
                                     batadv_hash_dat, dat_entry,
@@ -334,7 +349,7 @@ static void batadv_dat_entry_add(struct batadv_priv *bat_priv, __be32 ip,
 
        if (unlikely(hash_added != 0)) {
                /* remove the reference for the hash */
-               batadv_dat_entry_free_ref(dat_entry);
+               batadv_dat_entry_put(dat_entry);
                goto out;
        }
 
@@ -343,7 +358,7 @@ static void batadv_dat_entry_add(struct batadv_priv *bat_priv, __be32 ip,
 
 out:
        if (dat_entry)
-               batadv_dat_entry_free_ref(dat_entry);
+               batadv_dat_entry_put(dat_entry);
 }
 
 #ifdef CONFIG_BATMAN_ADV_DEBUG
@@ -527,12 +542,12 @@ static void batadv_choose_next_candidate(struct batadv_priv *bat_priv,
                                                          max_orig_node))
                                continue;
 
-                       if (!atomic_inc_not_zero(&orig_node->refcount))
+                       if (!kref_get_unless_zero(&orig_node->refcount))
                                continue;
 
                        max = tmp_max;
                        if (max_orig_node)
-                               batadv_orig_node_free_ref(max_orig_node);
+                               batadv_orig_node_put(max_orig_node);
                        max_orig_node = orig_node;
                }
                rcu_read_unlock();
@@ -639,9 +654,7 @@ static bool batadv_dat_send_data(struct batadv_priv *bat_priv,
                        goto free_neigh;
                }
 
-               send_status = batadv_send_skb_packet(tmp_skb,
-                                                    neigh_node->if_incoming,
-                                                    neigh_node->addr);
+               send_status = batadv_send_unicast_skb(tmp_skb, neigh_node);
                if (send_status == NET_XMIT_SUCCESS) {
                        /* count the sent packet */
                        switch (packet_subtype) {
@@ -659,9 +672,9 @@ static bool batadv_dat_send_data(struct batadv_priv *bat_priv,
                        ret = true;
                }
 free_neigh:
-               batadv_neigh_node_free_ref(neigh_node);
+               batadv_neigh_node_put(neigh_node);
 free_orig:
-               batadv_orig_node_free_ref(cand[i].orig_node);
+               batadv_orig_node_put(cand[i].orig_node);
        }
 
 out:
@@ -825,7 +838,7 @@ int batadv_dat_cache_seq_print_text(struct seq_file *seq, void *offset)
 
 out:
        if (primary_if)
-               batadv_hardif_free_ref(primary_if);
+               batadv_hardif_put(primary_if);
        return 0;
 }
 
@@ -1014,7 +1027,7 @@ bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv,
        }
 out:
        if (dat_entry)
-               batadv_dat_entry_free_ref(dat_entry);
+               batadv_dat_entry_put(dat_entry);
        return ret;
 }
 
@@ -1094,7 +1107,7 @@ bool batadv_dat_snoop_incoming_arp_request(struct batadv_priv *bat_priv,
        }
 out:
        if (dat_entry)
-               batadv_dat_entry_free_ref(dat_entry);
+               batadv_dat_entry_put(dat_entry);
        if (ret)
                kfree_skb(skb);
        return ret;
@@ -1247,6 +1260,6 @@ bool batadv_dat_drop_broadcast_packet(struct batadv_priv *bat_priv,
 
 out:
        if (dat_entry)
-               batadv_dat_entry_free_ref(dat_entry);
+               batadv_dat_entry_put(dat_entry);
        return ret;
 }