aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-09-24 20:06:16 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-24 20:06:16 -0400
commitf25f60beea574d7cff65680694a909e58c5c81c1 (patch)
tree0fbfa6a66cb67a995e2a98ffcdfa7df63f17c01e /net
parentd7757be133cc05620608af46acd178686681b7ef (diff)
parent36dd2fdb37efdab15844eb72026f8ce3aa0fb560 (diff)
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: nfs[23] tcp breakage in mount with binary options net: fix htmldocs sunrpc, clnt.c
Diffstat (limited to 'net')
-rw-r--r--net/sunrpc/clnt.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index a417d5ab5dd7..38829e20500b 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -640,10 +640,11 @@ EXPORT_SYMBOL_GPL(rpc_call_async);
640/** 640/**
641 * rpc_run_bc_task - Allocate a new RPC task for backchannel use, then run 641 * rpc_run_bc_task - Allocate a new RPC task for backchannel use, then run
642 * rpc_execute against it 642 * rpc_execute against it
643 * @ops: RPC call ops 643 * @req: RPC request
644 * @tk_ops: RPC call ops
644 */ 645 */
645struct rpc_task *rpc_run_bc_task(struct rpc_rqst *req, 646struct rpc_task *rpc_run_bc_task(struct rpc_rqst *req,
646 const struct rpc_call_ops *tk_ops) 647 const struct rpc_call_ops *tk_ops)
647{ 648{
648 struct rpc_task *task; 649 struct rpc_task *task;
649 struct xdr_buf *xbufp = &req->rq_snd_buf; 650 struct xdr_buf *xbufp = &req->rq_snd_buf;