diff options
author | WANG Cong <xiyou.wangcong@gmail.com> | 2008-01-08 01:34:29 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:00:46 -0500 |
commit | 64c31b3f76482bb64459e786f9eca3bd0164d153 (patch) | |
tree | 4f8fa9e23dbb2b2a73c4516263c983b01cff4f3a /net/xfrm | |
parent | d66e37a99d323012165ce91fd5c4518e2fcea0c5 (diff) |
[XFRM] xfrm_policy_destroy: Rename and relative fixes.
Since __xfrm_policy_destroy is used to destory the resources
allocated by xfrm_policy_alloc. So using the name
__xfrm_policy_destroy is not correspond with xfrm_policy_alloc.
Rename it to xfrm_policy_destroy.
And along with some instances that call xfrm_policy_alloc
but not using xfrm_policy_destroy to destroy the resource,
fix them.
Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/xfrm')
-rw-r--r-- | net/xfrm/xfrm_policy.c | 4 | ||||
-rw-r--r-- | net/xfrm/xfrm_user.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index d83227baaa09..534b29eb46fe 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c | |||
@@ -221,7 +221,7 @@ EXPORT_SYMBOL(xfrm_policy_alloc); | |||
221 | 221 | ||
222 | /* Destroy xfrm_policy: descendant resources must be released to this moment. */ | 222 | /* Destroy xfrm_policy: descendant resources must be released to this moment. */ |
223 | 223 | ||
224 | void __xfrm_policy_destroy(struct xfrm_policy *policy) | 224 | void xfrm_policy_destroy(struct xfrm_policy *policy) |
225 | { | 225 | { |
226 | BUG_ON(!policy->dead); | 226 | BUG_ON(!policy->dead); |
227 | 227 | ||
@@ -233,7 +233,7 @@ void __xfrm_policy_destroy(struct xfrm_policy *policy) | |||
233 | security_xfrm_policy_free(policy); | 233 | security_xfrm_policy_free(policy); |
234 | kfree(policy); | 234 | kfree(policy); |
235 | } | 235 | } |
236 | EXPORT_SYMBOL(__xfrm_policy_destroy); | 236 | EXPORT_SYMBOL(xfrm_policy_destroy); |
237 | 237 | ||
238 | static void xfrm_policy_gc_kill(struct xfrm_policy *policy) | 238 | static void xfrm_policy_gc_kill(struct xfrm_policy *policy) |
239 | { | 239 | { |
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index 6424e5360511..35fc16ae50ac 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c | |||
@@ -1043,7 +1043,7 @@ static struct xfrm_policy *xfrm_policy_construct(struct xfrm_userpolicy_info *p, | |||
1043 | return xp; | 1043 | return xp; |
1044 | error: | 1044 | error: |
1045 | *errp = err; | 1045 | *errp = err; |
1046 | kfree(xp); | 1046 | xfrm_policy_destroy(xp); |
1047 | return NULL; | 1047 | return NULL; |
1048 | } | 1048 | } |
1049 | 1049 | ||