svcrdma: Remove syslog warnings in work completion handlers

These can result in a lot of log noise, and are able to be triggered
by client misbehavior. Since there are trace points in these
handlers now, there's no need to spam the log.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>

diff --git a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
index 3ebb158c2279af8d8f642e34c72ebe4130450e74..65e2fb9aac656f2daab864a077543f4abb9e8fe2 100644 (file)
--- a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
@@ -272,11 +272,8 @@ bool svc_rdma_post_recvs(struct svcxprt_rdma *rdma)
                        return false;
                ctxt->rc_temp = true;
                ret = __svc_rdma_post_recv(rdma, ctxt);
-               if (ret) {
-                       pr_err("svcrdma: failure posting recv buffers: %d\n",
-                              ret);
+               if (ret)
                        return false;
-               }
        }
        return true;
 }
@@ -322,10 +319,6 @@ static void svc_rdma_wc_receive(struct ib_cq *cq, struct ib_wc *wc)
        goto out;
 
 flushed:
-       if (wc->status != IB_WC_WR_FLUSH_ERR)
-               pr_err("svcrdma: Recv: %s (%u/0x%x)\n",
-                      ib_wc_status_msg(wc->status),
-                      wc->status, wc->vendor_err);
 post_err:
        svc_rdma_recv_ctxt_put(rdma, ctxt);
        set_bit(XPT_CLOSE, &rdma->sc_xprt.xpt_flags);

diff --git a/net/sunrpc/xprtrdma/svc_rdma_rw.c b/net/sunrpc/xprtrdma/svc_rdma_rw.c
index 65ee6fd60162702e0d04d3de36e51765ed6ac242..2121c9b4d27567201c2b13704e917f1c2b05f141 100644 (file)
--- a/net/sunrpc/xprtrdma/svc_rdma_rw.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_rw.c
@@ -212,13 +212,8 @@ static void svc_rdma_write_done(struct ib_cq *cq, struct ib_wc *wc)
        atomic_add(cc->cc_sqecount, &rdma->sc_sq_avail);
        wake_up(&rdma->sc_send_wait);
 
-       if (unlikely(wc->status != IB_WC_SUCCESS)) {
+       if (unlikely(wc->status != IB_WC_SUCCESS))
                set_bit(XPT_CLOSE, &rdma->sc_xprt.xpt_flags);
-               if (wc->status != IB_WC_WR_FLUSH_ERR)
-                       pr_err("svcrdma: write ctx: %s (%u/0x%x)\n",
-                              ib_wc_status_msg(wc->status),
-                              wc->status, wc->vendor_err);
-       }
 
        svc_rdma_write_info_free(info);
 }
@@ -277,10 +272,6 @@ static void svc_rdma_wc_read_done(struct ib_cq *cq, struct ib_wc *wc)
 
        if (unlikely(wc->status != IB_WC_SUCCESS)) {
                set_bit(XPT_CLOSE, &rdma->sc_xprt.xpt_flags);
-               if (wc->status != IB_WC_WR_FLUSH_ERR)
-                       pr_err("svcrdma: read ctx: %s (%u/0x%x)\n",
-                              ib_wc_status_msg(wc->status),
-                              wc->status, wc->vendor_err);
                svc_rdma_recv_ctxt_put(rdma, info->ri_readctxt);
        } else {
                spin_lock(&rdma->sc_rq_dto_lock);

diff --git a/net/sunrpc/xprtrdma/svc_rdma_sendto.c b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
index 1f200119268ccdff5674f49eadebbde0de86fdd1..6fdba72f89f478122645f44e364af9449c55258e 100644 (file)
--- a/net/sunrpc/xprtrdma/svc_rdma_sendto.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
@@ -272,10 +272,6 @@ static void svc_rdma_wc_send(struct ib_cq *cq, struct ib_wc *wc)
        if (unlikely(wc->status != IB_WC_SUCCESS)) {
                set_bit(XPT_CLOSE, &rdma->sc_xprt.xpt_flags);
                svc_xprt_enqueue(&rdma->sc_xprt);
-               if (wc->status != IB_WC_WR_FLUSH_ERR)
-                       pr_err("svcrdma: Send: %s (%u/0x%x)\n",
-                              ib_wc_status_msg(wc->status),
-                              wc->status, wc->vendor_err);
        }
 
        svc_xprt_put(&rdma->sc_xprt);

diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c
index ef6afcf5e9c4312591c36b0ae5f5dd7240c3e01d..027a3b07d32990fa1bbf655d730b9f8a187895fa 100644 (file)
--- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
@@ -590,11 +590,6 @@ static void __svc_rdma_free(struct work_struct *work)
        if (rdma->sc_qp && !IS_ERR(rdma->sc_qp))
                ib_drain_qp(rdma->sc_qp);
 
-       /* We should only be called from kref_put */
-       if (kref_read(&xprt->xpt_ref) != 0)
-               pr_err("svcrdma: sc_xprt still in use? (%d)\n",
-                      kref_read(&xprt->xpt_ref));
-
        svc_rdma_flush_recv_queues(rdma);
 
        /* Final put of backchannel client transport */