hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Trond Myklebust 2019-04-07 13:58:48 -04:00 committed by Anna Schumaker
parent 87150aaed9
commit 8357a9b60f
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/nfs/nfs4proc.c
View File

@ -1008,7 +1008,7 @@ out_start:
out_sleep: out_sleep:
if (args->sa_privileged) if (args->sa_privileged)
rpc_sleep_on_priority(&tbl->slot_tbl_waitq, task, rpc_sleep_on_priority(&tbl->slot_tbl_waitq, task,
NULL, RPC_PRIORITY_PRIVILEGED); RPC_PRIORITY_PRIVILEGED);
else else
rpc_sleep_on(&tbl->slot_tbl_waitq, task, NULL); rpc_sleep_on(&tbl->slot_tbl_waitq, task, NULL);
spin_unlock(&tbl->slot_tbl_lock); spin_unlock(&tbl->slot_tbl_lock);

1
include/linux/sunrpc/sched.h
View File

@ -231,7 +231,6 @@ void rpc_sleep_on(struct rpc_wait_queue *, struct rpc_task *,
rpc_action action); rpc_action action);
void rpc_sleep_on_priority(struct rpc_wait_queue *, void rpc_sleep_on_priority(struct rpc_wait_queue *,
struct rpc_task *, struct rpc_task *,
rpc_action action,
int priority); int priority);
void rpc_wake_up_queued_task_on_wq(struct workqueue_struct *wq, void rpc_wake_up_queued_task_on_wq(struct workqueue_struct *wq,
struct rpc_wait_queue *queue, struct rpc_wait_queue *queue,

7
net/sunrpc/sched.c
View File

@ -409,18 +409,17 @@ void rpc_sleep_on(struct rpc_wait_queue *q, struct rpc_task *task,
EXPORT_SYMBOL_GPL(rpc_sleep_on); EXPORT_SYMBOL_GPL(rpc_sleep_on);
void rpc_sleep_on_priority(struct rpc_wait_queue *q, struct rpc_task *task, 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)) if (!rpc_sleep_check_activated(task))
return; return;
rpc_set_tk_callback(task, action); priority -= RPC_PRIORITY_LOW;
/* /*
* Protect the queue operations. * Protect the queue operations.
*/ */
spin_lock_bh(&q->lock); 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); spin_unlock_bh(&q->lock);
} }
EXPORT_SYMBOL_GPL(rpc_sleep_on_priority); EXPORT_SYMBOL_GPL(rpc_sleep_on_priority);