---

yaml --- r: 87039 b: refs/heads/master c: ee1a2c5 h: refs/heads/master i: 87037: 415107e 87035: 1cc8729 87031: 822696e 87023: c47fe67 87007: 4c7fbf2 86975: de66cf1 86911: 219931f 86783: d60ca20 86527: 88ffd7f 86015: ba75859 v: v3
git-mirror · Mar 7, 2008 · 0da71f2 · 0da71f2
1 parent 3c5a929
commit 0da71f2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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",