1 files changed, 5 insertions, 9 deletions

diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
index b140c092d226..f14f24ee9983 100644
--- a/net/sunrpc/sched.c
+++ b/net/sunrpc/sched.c
@@ -297,7 +297,7 @@ static int rpc_complete_task(struct rpc_task *task)
         clear_bit(RPC_TASK_ACTIVE, &task->tk_runstate);
         ret = atomic_dec_and_test(&task->tk_count);
         if (waitqueue_active(wq))
-                __wake_up_locked_key(wq, TASK_NORMAL, 1, &k);
+                __wake_up_locked_key(wq, TASK_NORMAL, &k);
         spin_unlock_irqrestore(&wq->lock, flags);
         return ret;
 }
@@ -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);
 }