diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-08-08 08:30:29 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-08-08 08:30:29 -0400 |
| commit | 0a2d31b62dba9b5b92a38c67c9cc42630513662a (patch) | |
| tree | f755d74ec85248de645e10c45ed1a2ed467530f6 /kernel/audit_tree.c | |
| parent | 8039290a91c5dc4414093c086987a5d7738fe2fd (diff) | |
| parent | df944f66784e6d4f2f50739263a4947885d8b6ae (diff) | |
Merge branch 'fix/kconfig' into for-linus
Diffstat (limited to 'kernel/audit_tree.c')
| -rw-r--r-- | kernel/audit_tree.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c index e99dda04b126..5bf0790497e7 100644 --- a/kernel/audit_tree.c +++ b/kernel/audit_tree.c | |||
| @@ -93,16 +93,10 @@ static inline void get_tree(struct audit_tree *tree) | |||
| 93 | atomic_inc(&tree->count); | 93 | atomic_inc(&tree->count); |
| 94 | } | 94 | } |
| 95 | 95 | ||
| 96 | static void __put_tree(struct rcu_head *rcu) | ||
| 97 | { | ||
| 98 | struct audit_tree *tree = container_of(rcu, struct audit_tree, head); | ||
| 99 | kfree(tree); | ||
| 100 | } | ||
| 101 | |||
| 102 | static inline void put_tree(struct audit_tree *tree) | 96 | static inline void put_tree(struct audit_tree *tree) |
| 103 | { | 97 | { |
| 104 | if (atomic_dec_and_test(&tree->count)) | 98 | if (atomic_dec_and_test(&tree->count)) |
| 105 | call_rcu(&tree->head, __put_tree); | 99 | kfree_rcu(tree, head); |
| 106 | } | 100 | } |
| 107 | 101 | ||
| 108 | /* to avoid bringing the entire thing in audit.h */ | 102 | /* to avoid bringing the entire thing in audit.h */ |
