Merge branch 'next'
Trond Myklebust [Wed, 15 Oct 2008 19:54:56 +0000 (15:54 -0400)]
1  2 
fs/nfs/super.c
net/sunrpc/clnt.c
net/sunrpc/rpcb_clnt.c
net/sunrpc/xprtrdma/rpc_rdma.c

diff --cc fs/nfs/super.c
Simple merge
Simple merge
Simple merge
@@@ -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 ||