RDS: Turn down alarming reconnect messages

RDS's error messages when a connection goes down are a little
extreme. A connection may go down, and it will be re-established,
and everything is fine. This patch links these messages through
rdsdebug(), instead of to printk directly.

Signed-off-by: Andy Grover <andy.grover@oracle.com>

diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c
index b3110315e8822b132f701654e081c48df44ba60b..6f3e21cc51b327ea404326e69a183fe27331f1f0 100644 (file)
--- a/net/rds/ib_cm.c
+++ b/net/rds/ib_cm.c
@@ -203,9 +203,10 @@ static void rds_ib_qp_event_handler(struct ib_event *event, void *data)
                rdma_notify(ic->i_cm_id, IB_EVENT_COMM_EST);
                break;
        default:
-               rds_ib_conn_error(conn, "RDS/IB: Fatal QP Event %u "
+               rdsdebug("Fatal QP Event %u "
                        "- connection %pI4->%pI4, reconnecting\n",
                        event->event, &conn->c_laddr, &conn->c_faddr);
+               rds_conn_drop(conn);
                break;
        }
 }

diff --git a/net/rds/iw_cm.c b/net/rds/iw_cm.c
index 394cf6b4d0aad63c4dbb7bb51ecdd4b0b69b2dbc..b2666320d6f59ef4a9d9ae336af2baa28a2084c1 100644 (file)
--- a/net/rds/iw_cm.c
+++ b/net/rds/iw_cm.c
@@ -156,9 +156,11 @@ static void rds_iw_qp_event_handler(struct ib_event *event, void *data)
        case IB_EVENT_QP_REQ_ERR:
        case IB_EVENT_QP_FATAL:
        default:
-               rds_iw_conn_error(conn, "RDS/IW: Fatal QP Event %u - connection %pI4->%pI4...reconnecting\n",
+               rdsdebug("Fatal QP Event %u "
+                       "- connection $pI4->%pI4, reconnecting\n",
                        event->event, &conn->c_laddr,
                        &conn->c_faddr);
+               rds_conn_drop(conn);
                break;
        }
 }

diff --git a/net/rds/rdma_transport.c b/net/rds/rdma_transport.c
index 213d539019ba80a51a3d6987698cc16200188560..7154c77d27f68e068506b2351b519f86663ceadd 100644 (file)
--- a/net/rds/rdma_transport.c
+++ b/net/rds/rdma_transport.c
@@ -101,7 +101,7 @@ int rds_rdma_cm_event_handler(struct rdma_cm_id *cm_id,
                break;
 
        case RDMA_CM_EVENT_DISCONNECTED:
-               printk(KERN_WARNING "RDS/RDMA: DISCONNECT event - dropping connection "
+               rdsdebug("DISCONNECT event - dropping connection "
                        "%pI4->%pI4\n", &conn->c_laddr,
                         &conn->c_faddr);
                rds_conn_drop(conn);