From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Wed, 15 Oct 2008 19:54:56 +0000 (-0400)
Subject: Merge branch 'next'
X-Git-Tag: v2.6.28-rc1~266^2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=6925bac120097b823fc990c143b9789c21cc60b5;p=linux-2.6-block.git

Merge branch 'next'
---

6925bac120097b823fc990c143b9789c21cc60b5
diff --cc net/sunrpc/xprtrdma/rpc_rdma.c
index 5c1954d28d09,15101f294e00..14106d26bb95
--- a/net/sunrpc/xprtrdma/rpc_rdma.c
+++ b/net/sunrpc/xprtrdma/rpc_rdma.c
@@@ -799,10 -818,10 +818,10 @@@ repost
  			status = rep->rr_len;
  		}
  		/* Fix up the rpc results for upper layer */
- 		rpcrdma_inline_fixup(rqst, (char *)iptr, rep->rr_len);
+ 		rpcrdma_inline_fixup(rqst, (char *)iptr, rep->rr_len, rdmalen);
  		break;
  
 -	case __constant_htonl(RDMA_NOMSG):
 +	case htonl(RDMA_NOMSG):
  		/* never expect read or write chunks, always reply chunks */
  		if (headerp->rm_body.rm_chunks[0] != xdr_zero ||
  		    headerp->rm_body.rm_chunks[1] != xdr_zero ||