Skip to content

Commit

Permalink
security,rcu: Convert call_rcu(sel_netnode_free) to kfree_rcu()
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Paul E. McKenney <[email protected]>
Cc: Stephen Smalley <[email protected]>
Cc: James Morris <[email protected]>
Cc: Eric Paris <[email protected]>
Reviewed-by: Josh Triplett <[email protected]>
  • Loading branch information
Lai Jiangshan authored and paulmck committed Jul 20, 2011
1 parent f218a7e commit 9801c60
Showing 1 changed file with 2 additions and 18 deletions.
20 changes: 2 additions & 18 deletions security/selinux/netnode.c
Original file line number Diff line number Diff line change
Expand Up @@ -68,22 +68,6 @@ static LIST_HEAD(sel_netnode_list);
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
Expand Down Expand Up @@ -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++;
}
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 9801c60

Please sign in to comment.