diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:29:00 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:29:00 -0500 |
commit | 9caafa6c8686e319cf4d5f3757b3972c6c522b7c (patch) | |
tree | b38979b835b5d22e681b175d0b98a3c7560d9c59 /net/sunrpc/sched.c | |
parent | 51e9f2ff83df6b1c81c5c44f4486c68ed87aa20e (diff) | |
parent | cac0e8e8bb2e7a086643bdd00c41d900a79bb4fa (diff) |
Merge branch 'upstream-fixes'
Diffstat (limited to 'net/sunrpc/sched.c')
-rw-r--r-- | net/sunrpc/sched.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c index 7415406aa1ae..802d4fe0f55c 100644 --- a/net/sunrpc/sched.c +++ b/net/sunrpc/sched.c | |||
@@ -908,10 +908,10 @@ void rpc_release_task(struct rpc_task *task) | |||
908 | 908 | ||
909 | /** | 909 | /** |
910 | * rpc_run_task - Allocate a new RPC task, then run rpc_execute against it | 910 | * rpc_run_task - Allocate a new RPC task, then run rpc_execute against it |
911 | * @clnt - pointer to RPC client | 911 | * @clnt: pointer to RPC client |
912 | * @flags - RPC flags | 912 | * @flags: RPC flags |
913 | * @ops - RPC call ops | 913 | * @ops: RPC call ops |
914 | * @data - user call data | 914 | * @data: user call data |
915 | */ | 915 | */ |
916 | struct rpc_task *rpc_run_task(struct rpc_clnt *clnt, int flags, | 916 | struct rpc_task *rpc_run_task(struct rpc_clnt *clnt, int flags, |
917 | const struct rpc_call_ops *ops, | 917 | const struct rpc_call_ops *ops, |
@@ -930,6 +930,7 @@ EXPORT_SYMBOL(rpc_run_task); | |||
930 | /** | 930 | /** |
931 | * rpc_find_parent - find the parent of a child task. | 931 | * rpc_find_parent - find the parent of a child task. |
932 | * @child: child task | 932 | * @child: child task |
933 | * @parent: parent task | ||
933 | * | 934 | * |
934 | * Checks that the parent task is still sleeping on the | 935 | * Checks that the parent task is still sleeping on the |
935 | * queue 'childq'. If so returns a pointer to the parent. | 936 | * queue 'childq'. If so returns a pointer to the parent. |