From abe5fd6d09b90ad32203da5058e1f7b0d9220cf3 Mon Sep 17 00:00:00 2001 From: Tom Tucker Date: Mon, 20 Feb 2012 13:07:42 -0600 Subject: [PATCH] --- yaml --- r: 294579 b: refs/heads/master c: 4a6862b3649d705bf41a36e3c7943d0322a9ee27 h: refs/heads/master i: 294577: 2b733c301ab0ada7498716e4e91b863cdb15a4c2 294575: f0a5d4e4b8b1649b13a1f2398cd23a186f396b1a v: v3 --- [refs] | 2 +- trunk/net/sunrpc/xprtrdma/rpc_rdma.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index cf4bd9d82355..fb729fca810f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 18d98f6c04991dd3c12acf6f39cea40e9510640a +refs/heads/master: 4a6862b3649d705bf41a36e3c7943d0322a9ee27 diff --git a/trunk/net/sunrpc/xprtrdma/rpc_rdma.c b/trunk/net/sunrpc/xprtrdma/rpc_rdma.c index 554d0814c875..12de982b7a50 100644 --- a/trunk/net/sunrpc/xprtrdma/rpc_rdma.c +++ b/trunk/net/sunrpc/xprtrdma/rpc_rdma.c @@ -771,13 +771,18 @@ rpcrdma_reply_handler(struct rpcrdma_rep *rep) /* get request object */ req = rpcr_to_rdmar(rqst); + if (req->rl_reply) { + spin_unlock(&xprt->transport_lock); + dprintk("RPC: %s: duplicate reply 0x%p to RPC " + "request 0x%p: xid 0x%08x\n", __func__, rep, req, + headerp->rm_xid); + goto repost; + } dprintk("RPC: %s: reply 0x%p completes request 0x%p\n" " RPC request 0x%p xid 0x%08x\n", __func__, rep, req, rqst, headerp->rm_xid); - BUG_ON(!req || req->rl_reply); - /* from here on, the reply is no longer an orphan */ req->rl_reply = rep;