diff options
| author | Trond Myklebust | 2006-01-03 09:55:03 +0100 |
|---|---|---|
| committer | Trond Myklebust | 2006-01-06 20:58:39 +0100 |
| commit | abbcf28f23d53e8ec56a91f3528743913fa2694a (patch) | |
| tree | 97dafc3840e4660ac0fcf99bbdc7eddc2fecd08a /net/sunrpc/sched.c | |
| parent | NFS: Work correctly with single-page ->writepage() calls (diff) | |
| download | kernel-qcow2-linux-abbcf28f23d53e8ec56a91f3528743913fa2694a.tar.gz kernel-qcow2-linux-abbcf28f23d53e8ec56a91f3528743913fa2694a.tar.xz kernel-qcow2-linux-abbcf28f23d53e8ec56a91f3528743913fa2694a.zip | |
SUNRPC: Yet more RPC cleanups
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'net/sunrpc/sched.c')
| -rw-r--r-- | net/sunrpc/sched.c | 31 |
1 files changed, 12 insertions, 19 deletions
diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c index 54e60a657500..3fcf7b0e1f6c 100644 --- a/net/sunrpc/sched.c +++ b/net/sunrpc/sched.c @@ -555,28 +555,22 @@ __rpc_atrun(struct rpc_task *task) } /* - * Helper that calls task->tk_exit if it exists and then returns - * true if we should exit __rpc_execute. + * Helper that calls task->tk_exit if it exists */ -static inline int __rpc_do_exit(struct rpc_task *task) +void rpc_exit_task(struct rpc_task *task) { + task->tk_action = NULL; if (task->tk_exit != NULL) { - lock_kernel(); task->tk_exit(task); - unlock_kernel(); - /* If tk_action is non-null, we should restart the call */ if (task->tk_action != NULL) { - if (!RPC_ASSASSINATED(task)) { - /* Release RPC slot and buffer memory */ - xprt_release(task); - rpc_free(task); - return 0; - } - printk(KERN_ERR "RPC: dead task tried to walk away.\n"); + WARN_ON(RPC_ASSASSINATED(task)); + /* Always release the RPC slot and buffer memory */ + xprt_release(task); + rpc_free(task); } } - return 1; } +EXPORT_SYMBOL(rpc_exit_task); static int rpc_wait_bit_interruptible(void *word) { @@ -631,12 +625,11 @@ static int __rpc_execute(struct rpc_task *task) * by someone else. */ if (!RPC_IS_QUEUED(task)) { - if (task->tk_action != NULL) { - lock_kernel(); - task->tk_action(task); - unlock_kernel(); - } else if (__rpc_do_exit(task)) + if (task->tk_action == NULL) break; + lock_kernel(); + task->tk_action(task); + unlock_kernel(); } /* |