Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma

[sfrench/cifs-2.6.git] / net / rds / ib_cm.c

diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c
index 66c6eb56072b712015fdaebb3dfc8af17408d91e..c36d89cd14a10ec02b9c0708a468b244880dc9f0 100644 (file)
--- a/net/rds/ib_cm.c
+++ b/net/rds/ib_cm.c
@@ -460,10 +460,7 @@ static int rds_ib_setup_qp(struct rds_connection *conn)
         * completion queue and send queue. This extra space is used for FRMR
         * registration and invalidation work requests
         */
-       fr_queue_space = rds_ibdev->use_fastreg ?
-                        (RDS_IB_DEFAULT_FR_WR + 1) +
-                        (RDS_IB_DEFAULT_FR_INV_WR + 1)
-                        : 0;
+       fr_queue_space = (rds_ibdev->use_fastreg ? RDS_IB_DEFAULT_FR_WR : 0);
 
        /* add the conn now so that connection establishment has the dev */
        rds_ib_add_conn(rds_ibdev, conn);
@@ -530,7 +527,6 @@ static int rds_ib_setup_qp(struct rds_connection *conn)
        attr.send_cq = ic->i_send_cq;
        attr.recv_cq = ic->i_recv_cq;
        atomic_set(&ic->i_fastreg_wrs, RDS_IB_DEFAULT_FR_WR);
-       atomic_set(&ic->i_fastunreg_wrs, RDS_IB_DEFAULT_FR_INV_WR);
 
        /*
         * XXX this can fail if max_*_wr is too large?  Are we supposed
@@ -611,11 +607,11 @@ send_hdrs_dma_out:
 qp_out:
        rdma_destroy_qp(ic->i_cm_id);
 recv_cq_out:
-       if (!ib_destroy_cq(ic->i_recv_cq))
-               ic->i_recv_cq = NULL;
+       ib_destroy_cq(ic->i_recv_cq);
+       ic->i_recv_cq = NULL;
 send_cq_out:
-       if (!ib_destroy_cq(ic->i_send_cq))
-               ic->i_send_cq = NULL;
+       ib_destroy_cq(ic->i_send_cq);
+       ic->i_send_cq = NULL;
 rds_ibdev_out:
        rds_ib_remove_conn(rds_ibdev, conn);
 out:
@@ -1009,8 +1005,7 @@ void rds_ib_conn_path_shutdown(struct rds_conn_path *cp)
                wait_event(rds_ib_ring_empty_wait,
                           rds_ib_ring_empty(&ic->i_recv_ring) &&
                           (atomic_read(&ic->i_signaled_sends) == 0) &&
-                          (atomic_read(&ic->i_fastreg_wrs) == RDS_IB_DEFAULT_FR_WR) &&
-                          (atomic_read(&ic->i_fastunreg_wrs) == RDS_IB_DEFAULT_FR_INV_WR));
+                          (atomic_read(&ic->i_fastreg_wrs) == RDS_IB_DEFAULT_FR_WR));
                tasklet_kill(&ic->i_send_tasklet);
                tasklet_kill(&ic->i_recv_tasklet);