aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLai Jiangshan <laijs@cn.fujitsu.com>2011-03-18 00:11:07 -0400
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>2011-05-08 01:50:54 -0400
commit3acb458c32293405cf68985b7b3ac5dc0a5e7929 (patch)
tree2943bc04adaedf25377c954087c7277118a4aae1
parent75ef0368d182785c7c5c06ac11081e31257a313e (diff)
security,rcu: convert call_rcu(user_update_rcu_disposal) to kfree_rcu()
The rcu callback user_update_rcu_disposal() just calls a kfree(), so we use kfree_rcu() instead of the call_rcu(user_update_rcu_disposal). Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com> Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Acked-by: David Howells <dhowells@redhat.com> Reviewed-by: Josh Triplett <josh@joshtriplett.org>
-rw-r--r--security/keys/user_defined.c16
1 files changed, 2 insertions, 14 deletions
diff --git a/security/keys/user_defined.c b/security/keys/user_defined.c
index c6ca8662a468..f66baf44f32d 100644
--- a/security/keys/user_defined.c
+++ b/security/keys/user_defined.c
@@ -69,18 +69,6 @@ error:
69EXPORT_SYMBOL_GPL(user_instantiate); 69EXPORT_SYMBOL_GPL(user_instantiate);
70 70
71/* 71/*
72 * dispose of the old data from an updated user defined key
73 */
74static void user_update_rcu_disposal(struct rcu_head *rcu)
75{
76 struct user_key_payload *upayload;
77
78 upayload = container_of(rcu, struct user_key_payload, rcu);
79
80 kfree(upayload);
81}
82
83/*
84 * update a user defined key 72 * update a user defined key
85 * - the key's semaphore is write-locked 73 * - the key's semaphore is write-locked
86 */ 74 */
@@ -114,7 +102,7 @@ int user_update(struct key *key, const void *data, size_t datalen)
114 key->expiry = 0; 102 key->expiry = 0;
115 } 103 }
116 104
117 call_rcu(&zap->rcu, user_update_rcu_disposal); 105 kfree_rcu(zap, rcu);
118 106
119error: 107error:
120 return ret; 108 return ret;
@@ -145,7 +133,7 @@ void user_revoke(struct key *key)
145 133
146 if (upayload) { 134 if (upayload) {
147 rcu_assign_pointer(key->payload.data, NULL); 135 rcu_assign_pointer(key->payload.data, NULL);
148 call_rcu(&upayload->rcu, user_update_rcu_disposal); 136 kfree_rcu(upayload, rcu);
149 } 137 }
150} 138}
151 139