security,rcu: Convert call_rcu(sel_netnode_free) to kfree_rcu()
Lai Jiangshan [Fri, 18 Mar 2011 04:05:22 +0000 (12:05 +0800)]
The rcu callback sel_netnode_free() just calls a kfree(),
so we use kfree_rcu() instead of the call_rcu(sel_netnode_free).

Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Stephen Smalley <sds@tycho.nsa.gov>
Cc: James Morris <jmorris@namei.org>
Cc: Eric Paris <eparis@parisplace.org>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>

security/selinux/netnode.c

index 3618251..8b691a8 100644 (file)
@@ -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;
        }