Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  rcu: Fix wrong check in list_splice_init_rcu()
  net,rcu: Convert call_rcu(xt_rateest_free_rcu) to kfree_rcu()
  sysctl,rcu: Convert call_rcu(free_head) to kfree
  vmalloc,rcu: Convert call_rcu(rcu_free_vb) to kfree_rcu()
  vmalloc,rcu: Convert call_rcu(rcu_free_va) to kfree_rcu()
  ipc,rcu: Convert call_rcu(ipc_immediate_free) to kfree_rcu()
  ipc,rcu: Convert call_rcu(free_un) to kfree_rcu()
  security,rcu: Convert call_rcu(sel_netport_free) to kfree_rcu()
  security,rcu: Convert call_rcu(sel_netnode_free) to kfree_rcu()
  ia64,rcu: Convert call_rcu(sn_irq_info_free) to kfree_rcu()
  block,rcu: Convert call_rcu(disk_free_ptbl_rcu_cb) to kfree_rcu()
  scsi,rcu: Convert call_rcu(fc_rport_free_rcu) to kfree_rcu()
  audit_tree,rcu: Convert call_rcu(__put_tree) to kfree_rcu()
  security,rcu: Convert call_rcu(whitelist_item_free) to kfree_rcu()
  md,rcu: Convert call_rcu(free_conf) to kfree_rcu()

3 files changed, 5 insertions, 45 deletions

diff --git a/security/device_cgroup.c b/security/device_cgroup.c
index 1be68269e1c2..4450fbeec411 100644
--- a/security/device_cgroup.c
+++ b/security/device_cgroup.c
@@ -125,14 +125,6 @@ static int dev_whitelist_add(struct dev_cgroup *dev_cgroup,
         return 0;
 }
 
-static void whitelist_item_free(struct rcu_head *rcu)
-{
-        struct dev_whitelist_item *item;
-
-        item = container_of(rcu, struct dev_whitelist_item, rcu);
-        kfree(item);
-}
-
 /*
  * called under devcgroup_mutex
  */
@@ -155,7 +147,7 @@ remove:
                 walk->access &= ~wh->access;
                 if (!walk->access) {
                         list_del_rcu(&walk->list);
-                        call_rcu(&walk->rcu, whitelist_item_free);
+                        kfree_rcu(walk, rcu);
                 }
         }
 }
diff --git a/security/selinux/netnode.c b/security/selinux/netnode.c
index 3618251d0fdb..8b691a863186 100644
--- a/security/selinux/netnode.c
+++ b/security/selinux/netnode.c
@@ -69,22 +69,6 @@ static DEFINE_SPINLOCK(sel_netnode_lock);
 static struct sel_netnode_bkt sel_netnode_hash[SEL_NETNODE_HASH_SIZE];
 
 /**
- * sel_netnode_free - Frees a node entry
- * @p: the entry's RCU field
- *
- * Description:
- * This function is designed to be used as a callback to the call_rcu()
- * function so that memory allocated to a hash table node entry can be
- * released safely.
- *
- */
-static void sel_netnode_free(struct rcu_head *p)
-{
-        struct sel_netnode *node = container_of(p, struct sel_netnode, rcu);
-        kfree(node);
-}
-
-/**
  * sel_netnode_hashfn_ipv4 - IPv4 hashing function for the node table
  * @addr: IPv4 address
  *
@@ -193,7 +177,7 @@ static void sel_netnode_insert(struct sel_netnode *node)
                         rcu_dereference(sel_netnode_hash[idx].list.prev),
                         struct sel_netnode, list);
                 list_del_rcu(&tail->list);
-                call_rcu(&tail->rcu, sel_netnode_free);
+                kfree_rcu(tail, rcu);
         } else
                 sel_netnode_hash[idx].size++;
 }
@@ -306,7 +290,7 @@ static void sel_netnode_flush(void)
                 list_for_each_entry_safe(node, node_tmp,
                                          &sel_netnode_hash[idx].list, list) {
                                 list_del_rcu(&node->list);
-                                call_rcu(&node->rcu, sel_netnode_free);
+                                kfree_rcu(node, rcu);
                 }
                 sel_netnode_hash[idx].size = 0;
         }
diff --git a/security/selinux/netport.c b/security/selinux/netport.c
index cfe2d72d3fb7..ae76e298de7d 100644
--- a/security/selinux/netport.c
+++ b/security/selinux/netport.c
@@ -68,22 +68,6 @@ static DEFINE_SPINLOCK(sel_netport_lock);
 static struct sel_netport_bkt sel_netport_hash[SEL_NETPORT_HASH_SIZE];
 
 /**
- * sel_netport_free - Frees a port entry
- * @p: the entry's RCU field
- *
- * Description:
- * This function is designed to be used as a callback to the call_rcu()
- * function so that memory allocated to a hash table port entry can be
- * released safely.
- *
- */
-static void sel_netport_free(struct rcu_head *p)
-{
-        struct sel_netport *port = container_of(p, struct sel_netport, rcu);
-        kfree(port);
-}
-
-/**
  * sel_netport_hashfn - Hashing function for the port table
  * @pnum: port number
  *
@@ -142,7 +126,7 @@ static void sel_netport_insert(struct sel_netport *port)
                         rcu_dereference(sel_netport_hash[idx].list.prev),
                         struct sel_netport, list);
                 list_del_rcu(&tail->list);
-                call_rcu(&tail->rcu, sel_netport_free);
+                kfree_rcu(tail, rcu);
         } else
                 sel_netport_hash[idx].size++;
 }
@@ -241,7 +225,7 @@ static void sel_netport_flush(void)
                 list_for_each_entry_safe(port, port_tmp,
                                          &sel_netport_hash[idx].list, list) {
                         list_del_rcu(&port->list);
-                        call_rcu(&port->rcu, sel_netport_free);
+                        kfree_rcu(port, rcu);
                 }
                 sel_netport_hash[idx].size = 0;
         }