diff options
| author | Julia Lawall <julia.lawall@lip6.fr> | 2015-09-13 14:15:18 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-09-15 16:49:43 -0700 |
| commit | adf78edac09f9640cd9676571586c4be46fb527c (patch) | |
| tree | e19bdfe56461d5f3564e0c60db301b9bae2e42c7 /net | |
| parent | 58d29e3ce903dcafacee9e355225d64922325cf0 (diff) | |
| download | op-kernel-dev-adf78edac09f9640cd9676571586c4be46fb527c.zip op-kernel-dev-adf78edac09f9640cd9676571586c4be46fb527c.tar.gz | |
net: core: drop null test before destroy functions
Remove unneeded NULL test.
The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@@ expression x; @@
-if (x != NULL) {
\(kmem_cache_destroy\|mempool_destroy\|dma_pool_destroy\)(x);
x = NULL;
-}
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/sock.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index ca2984a..3307c02 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -2740,10 +2740,8 @@ static void req_prot_cleanup(struct request_sock_ops *rsk_prot) return; kfree(rsk_prot->slab_name); rsk_prot->slab_name = NULL; - if (rsk_prot->slab) { - kmem_cache_destroy(rsk_prot->slab); - rsk_prot->slab = NULL; - } + kmem_cache_destroy(rsk_prot->slab); + rsk_prot->slab = NULL; } static int req_prot_init(const struct proto *prot) @@ -2828,10 +2826,8 @@ void proto_unregister(struct proto *prot) list_del(&prot->node); mutex_unlock(&proto_list_mutex); - if (prot->slab != NULL) { - kmem_cache_destroy(prot->slab); - prot->slab = NULL; - } + kmem_cache_destroy(prot->slab); + prot->slab = NULL; req_prot_cleanup(prot->rsk_prot); |
