diff options
| author | Johannes Berg | 2015-10-13 10:28:16 +0200 |
|---|---|---|
| committer | Johannes Berg | 2015-10-13 10:28:43 +0200 |
| commit | 985f2c87a7109a42cac93f56ea595353d53a1746 (patch) | |
| tree | 69fe0acbbfeb6a348d6f4c64750d278e56b935b3 /net/sunrpc/sched.c | |
| parent | 4d57c67827d7bb79c4fcf6618bf80930808e50c6 (diff) | |
| parent | 6623c60dc28ee966cd85c6f12aa2fc3c952d0179 (diff) | |
Merge remote-tracking branch 'net-next/master' into mac80211-next
Merge net-next to get some driver changes that patches depend
on (in order to avoid conflicts).
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/sunrpc/sched.c')
| -rw-r--r-- | net/sunrpc/sched.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c index 337ca851a350..f14f24ee9983 100644 --- a/net/sunrpc/sched.c +++ b/net/sunrpc/sched.c @@ -1092,14 +1092,10 @@ void rpc_destroy_mempool(void) { rpciod_stop(); - if (rpc_buffer_mempool) - mempool_destroy(rpc_buffer_mempool); - if (rpc_task_mempool) - mempool_destroy(rpc_task_mempool); - if (rpc_task_slabp) - kmem_cache_destroy(rpc_task_slabp); - if (rpc_buffer_slabp) - kmem_cache_destroy(rpc_buffer_slabp); + mempool_destroy(rpc_buffer_mempool); + mempool_destroy(rpc_task_mempool); + kmem_cache_destroy(rpc_task_slabp); + kmem_cache_destroy(rpc_buffer_slabp); rpc_destroy_wait_queue(&delay_queue); } |