Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Trond Myklebust and committed by
Anna Schumaker
8357a9b6 87150aae

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