summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorRahul Iyer <iyer@netapp.com>2009-04-01 09:23:17 -0400
committerBenny Halevy <bhalevy@panasas.com>2009-06-17 14:11:34 -0700
commit343952fa5aac888934ffc203abed26a823400eb6 (patch)
tree95fc380be059ac0b0d3f7f89c1f76b2375685507 /net
parent0f91421e8ea986c990c01bf091ceff1d59c165ff (diff)
downloadop-kernel-dev-343952fa5aac888934ffc203abed26a823400eb6.zip
op-kernel-dev-343952fa5aac888934ffc203abed26a823400eb6.tar.gz
nfs41: Get the rpc_xprt * from the rpc_rqst instead of the rpc_clnt.
Obtain the rpc_xprt from the rpc_rqst so that calls and callback replies can both use the same code path. A client needs the rpc_xprt in order to reply to a callback. Signed-off-by: Rahul Iyer <iyer@netapp.com> Signed-off-by: Ricardo Labiaga <ricardo.labiaga@netapp.com> Signed-off-by: Benny Halevy <bhalevy@panasas.com>
Diffstat (limited to 'net')
-rw-r--r--net/sunrpc/xprt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
index 0eea2bf..c144611 100644
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@ -195,8 +195,8 @@ EXPORT_SYMBOL_GPL(xprt_load_transport);
*/
int xprt_reserve_xprt(struct rpc_task *task)
{
- struct rpc_xprt *xprt = task->tk_xprt;
struct rpc_rqst *req = task->tk_rqstp;
+ struct rpc_xprt *xprt = req->rq_xprt;
if (test_and_set_bit(XPRT_LOCKED, &xprt->state)) {
if (task == xprt->snd_task)
@@ -858,7 +858,7 @@ out_unlock:
void xprt_end_transmit(struct rpc_task *task)
{
- xprt_release_write(task->tk_xprt, task);
+ xprt_release_write(task->tk_rqstp->rq_xprt, task);
}
/**
OpenPOWER on IntegriCloud