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

[cascardo/linux.git] / net / sunrpc / xprtrdma / verbs.c

diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c
index aa9b444..878f1bf 100644 (file)
--- a/net/sunrpc/xprtrdma/verbs.c
+++ b/net/sunrpc/xprtrdma/verbs.c
@@ -608,10 +608,8 @@ rpcrdma_ep_create(struct rpcrdma_ep *ep, struct rpcrdma_ia *ia,
 
        /* set trigger for requesting send completion */
        ep->rep_cqinit = ep->rep_attr.cap.max_send_wr/2 - 1;
-       if (ep->rep_cqinit > RPCRDMA_MAX_UNSIGNALED_SENDS)
-               ep->rep_cqinit = RPCRDMA_MAX_UNSIGNALED_SENDS;
-       else if (ep->rep_cqinit <= 2)
-               ep->rep_cqinit = 0;
+       if (ep->rep_cqinit <= 2)
+               ep->rep_cqinit = 0;     /* always signal? */
        INIT_CQCOUNT(ep);
        init_waitqueue_head(&ep->rep_connect_wait);
        INIT_DELAYED_WORK(&ep->rep_connect_worker, rpcrdma_connect_worker);
@@ -844,10 +842,11 @@ retry:
 
                if (extras) {
                        rc = rpcrdma_ep_post_extra_recv(r_xprt, extras);
-                       if (rc)
+                       if (rc) {
                                pr_warn("%s: rpcrdma_ep_post_extra_recv: %i\n",
                                        __func__, rc);
                                rc = 0;
+                       }
                }
        }
 
@@ -1329,15 +1328,14 @@ rpcrdma_ep_post_extra_recv(struct rpcrdma_xprt *r_xprt, unsigned int count)
        struct rpcrdma_ia *ia = &r_xprt->rx_ia;
        struct rpcrdma_ep *ep = &r_xprt->rx_ep;
        struct rpcrdma_rep *rep;
-       unsigned long flags;
        int rc;
 
        while (count--) {
-               spin_lock_irqsave(&buffers->rb_lock, flags);
+               spin_lock(&buffers->rb_lock);
                if (list_empty(&buffers->rb_recv_bufs))
                        goto out_reqbuf;
                rep = rpcrdma_buffer_get_rep_locked(buffers);
-               spin_unlock_irqrestore(&buffers->rb_lock, flags);
+               spin_unlock(&buffers->rb_lock);
 
                rc = rpcrdma_ep_post_recv(ia, ep, rep);
                if (rc)
@@ -1347,7 +1345,7 @@ rpcrdma_ep_post_extra_recv(struct rpcrdma_xprt *r_xprt, unsigned int count)
        return 0;
 
 out_reqbuf:
-       spin_unlock_irqrestore(&buffers->rb_lock, flags);
+       spin_unlock(&buffers->rb_lock);
        pr_warn("%s: no extra receive buffers\n", __func__);
        return -ENOMEM;