Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt

[linux-2.6-omap-h63xx.git] / net / sunrpc / xprtrdma / verbs.c

diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c
index 44b0fb942e8db5834ddaebf81fe4fc1e3fbd5530..8ea283ecc522a8a5e8e033b12f6485fc5ef456c4 100644 (file)
--- a/net/sunrpc/xprtrdma/verbs.c
+++ b/net/sunrpc/xprtrdma/verbs.c
@@ -522,7 +522,7 @@ rpcrdma_ep_create(struct rpcrdma_ep *ep, struct rpcrdma_ia *ia,
                                struct rpcrdma_create_data_internal *cdata)
 {
        struct ib_device_attr devattr;
-       int rc;
+       int rc, err;
 
        rc = ib_query_device(ia->ri_id->device, &devattr);
        if (rc) {
@@ -648,8 +648,10 @@ rpcrdma_ep_create(struct rpcrdma_ep *ep, struct rpcrdma_ia *ia,
        return 0;
 
 out2:
-       if (ib_destroy_cq(ep->rep_cq))
-               ;
+       err = ib_destroy_cq(ep->rep_cq);
+       if (err)
+               dprintk("RPC:       %s: ib_destroy_cq returned %i\n",
+                       __func__, err);
 out1:
        return rc;
 }
@@ -1571,7 +1573,6 @@ rpcrdma_ep_post(struct rpcrdma_ia *ia,
        send_wr.sg_list = req->rl_send_iov;
        send_wr.num_sge = req->rl_niovs;
        send_wr.opcode = IB_WR_SEND;
-       send_wr.imm_data = 0;
        if (send_wr.num_sge == 4)       /* no need to sync any pad (constant) */
                ib_dma_sync_single_for_device(ia->ri_id->device,
                        req->rl_send_iov[3].addr, req->rl_send_iov[3].length,