From 0da71f2c2630dfb8d3c1a6fdcb775113c1de9301 Mon Sep 17 00:00:00 2001
From: Tom Talpey <tmt@netapp.com>
Date: Wed, 27 Feb 2008 15:04:26 -0500
Subject: [PATCH] --- yaml --- r: 87039 b: refs/heads/master c:
 ee1a2c564f67407947e89f1dac75ac0af0ba88c7 h: refs/heads/master i:   87037:
 415107e98ee485c8e22e4964febbc2ce12febc05   87035:
 1cc8729ba0eae4ee13005f93676a61cf9b6bd8be   87031:
 822696eb003bb63a1d844eb034fbdca0550d86ef   87023:
 c47fe67e616eeb32c7cb99021e1b3556bd88c7d1   87007:
 4c7fbf26e96390e3fd34696823041e9055fb0055   86975:
 de66cf1b8016d7cccf10e302ce71fdd8c4a7e1f9   86911:
 219931f9fbb679f3c65a176da20aed285727ad3f   86783:
 d60ca20516b72df57f943fbad6f44eff3ad28c04   86527:
 88ffd7fa6dae04f7aa7eab83a467f77b3865c589   86015:
 ba75859c7e4a96454c07ff7a064f086eac591220 v: v3

---
 [refs]                                | 2 +-
 trunk/net/sunrpc/xprtrdma/transport.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index da14336cbdb5..b7bed766d958 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af1b8c2ff7c337c4e96db12d6b7b61eaa91aa069
+refs/heads/master: ee1a2c564f67407947e89f1dac75ac0af0ba88c7
diff --git a/trunk/net/sunrpc/xprtrdma/transport.c b/trunk/net/sunrpc/xprtrdma/transport.c
index 02c522c17de5..a564c1a39ec5 100644
--- a/trunk/net/sunrpc/xprtrdma/transport.c
+++ b/trunk/net/sunrpc/xprtrdma/transport.c
@@ -614,7 +614,11 @@ xprt_rdma_free(void *buffer)
 		return;
 
 	req = container_of(buffer, struct rpcrdma_req, rl_xdr_buf[0]);
-	r_xprt = container_of(req->rl_buffer, struct rpcrdma_xprt, rx_buf);
+	if (req->rl_iov.length == 0) {	/* see allocate above */
+		r_xprt = container_of(((struct rpcrdma_req *) req->rl_buffer)->rl_buffer,
+				      struct rpcrdma_xprt, rx_buf);
+	} else
+		r_xprt = container_of(req->rl_buffer, struct rpcrdma_xprt, rx_buf);
 	rep = req->rl_reply;
 
 	dprintk("RPC:       %s: called on 0x%p%s\n",