History

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

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

Trond Myklebust committed 7 years ago

Commit 8357a9b1 parent 87150aa3 files · +4 −6Browse files

Unified · Split

3 files
  1. fs/nfs/nfs4proc.c +1 −1
  2. include/linux/sunrpc/sched.h +0 −1
  3. net/sunrpc/sched.c +3 −4
fs/nfs/nfs4proc.c+1−1
@@ -1008,7 +1008,7 @@ out_start: · 1007 unmodified lines
1008out_sleep:1008out_sleep:
1009 if (args->sa_privileged)1009 if (args->sa_privileged)
1010 rpc_sleep_on_priority(&tbl->slot_tbl_waitq, task,1010 rpc_sleep_on_priority(&tbl->slot_tbl_waitq, task,
1011 NULL, RPC_PRIORITY_PRIVILEGED);1011 RPC_PRIORITY_PRIVILEGED);
1012 else1012 else
1013 rpc_sleep_on(&tbl->slot_tbl_waitq, task, NULL);1013 rpc_sleep_on(&tbl->slot_tbl_waitq, task, NULL);
1014 spin_unlock(&tbl->slot_tbl_lock);1014 spin_unlock(&tbl->slot_tbl_lock);
include/linux/sunrpc/sched.h+0−1
@@ -231,7 +231,6 @@ void rpc_sleep_on(struct rpc_wait_queue *, struct rpc_task *, · 230 unmodified lines
231 rpc_action action);231 rpc_action action);
232void rpc_sleep_on_priority(struct rpc_wait_queue *,232void rpc_sleep_on_priority(struct rpc_wait_queue *,
233 struct rpc_task *,233 struct rpc_task *,
234 rpc_action action,
235 int priority);234 int priority);
236void rpc_wake_up_queued_task_on_wq(struct workqueue_struct *wq,235void rpc_wake_up_queued_task_on_wq(struct workqueue_struct *wq,
237 struct rpc_wait_queue *queue,236 struct rpc_wait_queue *queue,
net/sunrpc/sched.c+3−4
@@ -409,18 +409,17 @@ void rpc_sleep_on(struct rpc_wait_queue *q, struct rpc_task *task, · 408 unmodified lines
409EXPORT_SYMBOL_GPL(rpc_sleep_on);409EXPORT_SYMBOL_GPL(rpc_sleep_on);
410 410
411void rpc_sleep_on_priority(struct rpc_wait_queue *q, struct rpc_task *task,411void rpc_sleep_on_priority(struct rpc_wait_queue *q, struct rpc_task *task,
412 rpc_action action, int priority)412 int priority)
413{413{
414 if (!rpc_sleep_check_activated(task))414 if (!rpc_sleep_check_activated(task))
415 return;415 return;
416 416
417 rpc_set_tk_callback(task, action);417 priority -= RPC_PRIORITY_LOW;
418
419 /*418 /*
420 * Protect the queue operations.419 * Protect the queue operations.
421 */420 */
422 spin_lock_bh(&q->lock);421 spin_lock_bh(&q->lock);
423 __rpc_sleep_on_priority(q, task, priority - RPC_PRIORITY_LOW);422 __rpc_sleep_on_priority(q, task, priority);
424 spin_unlock_bh(&q->lock);423 spin_unlock_bh(&q->lock);
425}424}
426EXPORT_SYMBOL_GPL(rpc_sleep_on_priority);425EXPORT_SYMBOL_GPL(rpc_sleep_on_priority);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t