diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2016-03-04 11:28:18 -0500 |
|---|---|---|
| committer | Anna Schumaker <Anna.Schumaker@Netapp.com> | 2016-03-14 14:55:59 -0400 |
| commit | 59aa1f9a3cce388b4d7d842d6963df11d92a407e (patch) | |
| tree | 65778460b9050948004b79b65b95a23b8faf840d /include/linux/sunrpc/rpc_rdma.h | |
| parent | d8647f2d3c381a6f543358710eb07dafa7070854 (diff) | |
| download | linux-stable-59aa1f9a3cce388b4d7d842d6963df11d92a407e.tar.gz linux-stable-59aa1f9a3cce388b4d7d842d6963df11d92a407e.tar.bz2 linux-stable-59aa1f9a3cce388b4d7d842d6963df11d92a407e.zip | |
xprtrdma: Properly handle RDMA_ERROR replies
These are shorter than RPCRDMA_HDRLEN_MIN, and they need to
complete the waiting RPC.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Reviewed-by: Sagi Grimberg <sagig@mellanox.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Diffstat (limited to 'include/linux/sunrpc/rpc_rdma.h')
| -rw-r--r-- | include/linux/sunrpc/rpc_rdma.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/include/linux/sunrpc/rpc_rdma.h b/include/linux/sunrpc/rpc_rdma.h index 8c6d23cb0cae..3b1ff38f0c37 100644 --- a/include/linux/sunrpc/rpc_rdma.h +++ b/include/linux/sunrpc/rpc_rdma.h @@ -93,6 +93,12 @@ struct rpcrdma_msg { __be32 rm_pempty[3]; /* 3 empty chunk lists */ } rm_padded; + struct { + __be32 rm_err; + __be32 rm_vers_low; + __be32 rm_vers_high; + } rm_error; + __be32 rm_chunks[0]; /* read, write and reply chunks */ } rm_body; @@ -109,11 +115,6 @@ enum rpcrdma_errcode { ERR_CHUNK = 2 }; -struct rpcrdma_err_vers { - uint32_t rdma_vers_low; /* Version range supported by peer */ - uint32_t rdma_vers_high; -}; - enum rpcrdma_proc { RDMA_MSG = 0, /* An RPC call or reply msg */ RDMA_NOMSG = 1, /* An RPC call or reply msg - separate body */ |