SUNRPC: Remove unused argument 'action' from rpc_sleep_on_priority()

None of the callers set the 'action' argument, so let's just remove it.

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 741ff8c9c6ed3f7cda214ec0157eb6d9461ebdca..222eccd8a715b3a0e6051e6e931e62e55b1ce687 100644 (file)
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -1008,7 +1008,7 @@ out_start:
 out_sleep:
        if (args->sa_privileged)
                rpc_sleep_on_priority(&tbl->slot_tbl_waitq, task,
-                               NULL, RPC_PRIORITY_PRIVILEGED);
+                               RPC_PRIORITY_PRIVILEGED);
        else
                rpc_sleep_on(&tbl->slot_tbl_waitq, task, NULL);
        spin_unlock(&tbl->slot_tbl_lock);

diff --git a/include/linux/sunrpc/sched.h b/include/linux/sunrpc/sched.h
index 90e06c67f455767d38814c11a4fa077ad8e10034..5d517578a018b888487508a19a35c120c39c719e 100644 (file)
--- a/include/linux/sunrpc/sched.h
+++ b/include/linux/sunrpc/sched.h
@@ -231,7 +231,6 @@ void                rpc_sleep_on(struct rpc_wait_queue *, struct rpc_task *,
                                        rpc_action action);
 void           rpc_sleep_on_priority(struct rpc_wait_queue *,
                                        struct rpc_task *,
-                                       rpc_action action,
                                        int priority);
 void rpc_wake_up_queued_task_on_wq(struct workqueue_struct *wq,
                struct rpc_wait_queue *queue,

diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
index 8e96a841dd117a3985690fd5cea708175ab87253..04170c08b2cf310629f671c00285feb0a0a8c5fa 100644 (file)
--- a/net/sunrpc/sched.c
+++ b/net/sunrpc/sched.c
@@ -409,18 +409,17 @@ void rpc_sleep_on(struct rpc_wait_queue *q, struct rpc_task *task,
 EXPORT_SYMBOL_GPL(rpc_sleep_on);
 
 void rpc_sleep_on_priority(struct rpc_wait_queue *q, struct rpc_task *task,
-               rpc_action action, int priority)
+               int priority)
 {
        if (!rpc_sleep_check_activated(task))
                return;
 
-       rpc_set_tk_callback(task, action);
-
+       priority -= RPC_PRIORITY_LOW;
        /*
         * Protect the queue operations.
         */
        spin_lock_bh(&q->lock);
-       __rpc_sleep_on_priority(q, task, priority - RPC_PRIORITY_LOW);
+       __rpc_sleep_on_priority(q, task, priority);
        spin_unlock_bh(&q->lock);
 }
 EXPORT_SYMBOL_GPL(rpc_sleep_on_priority);