security,rcu: Convert call_rcu(sel_netport_free) to kfree_rcu()
Lai Jiangshan [Fri, 18 Mar 2011 04:05:57 +0000 (12:05 +0800)]
The rcu callback sel_netport_free() just calls a kfree(),
so we use kfree_rcu() instead of the call_rcu(sel_netport_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/netport.c

index cfe2d72..ae76e29 100644 (file)
@@ -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;
        }