smb: client: improve logging in smbd_conn_upcall()

Cc: Steve French <smfrench@gmail.com>
Cc: Tom Talpey <tom@talpey.com>
Cc: Long Li <longli@microsoft.com>
Cc: linux-cifs@vger.kernel.org
Cc: samba-technical@lists.samba.org
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Steve French <stfrench@microsoft.com>

diff --git a/fs/smb/client/smbdirect.c b/fs/smb/client/smbdirect.c
index 181349eda7a3268bb1a0e954a633bfccc8c8d077..8ed4ab6f1d3a2f3e4756fc0cd2161510660f38d4 100644 (file)
--- a/fs/smb/client/smbdirect.c
+++ b/fs/smb/client/smbdirect.c
@@ -178,9 +178,10 @@ static int smbd_conn_upcall(
 {
        struct smbd_connection *info = id->context;
        struct smbdirect_socket *sc = &info->socket;
+       const char *event_name = rdma_event_msg(event->event);
 
-       log_rdma_event(INFO, "event=%d status=%d\n",
-               event->event, event->status);
+       log_rdma_event(INFO, "event=%s status=%d\n",
+               event_name, event->status);
 
        switch (event->event) {
        case RDMA_CM_EVENT_ADDR_RESOLVED:
@@ -190,17 +191,19 @@ static int smbd_conn_upcall(
                break;
 
        case RDMA_CM_EVENT_ADDR_ERROR:
+               log_rdma_event(ERR, "connecting failed event=%s\n", event_name);
                info->ri_rc = -EHOSTUNREACH;
                complete(&info->ri_done);
                break;
 
        case RDMA_CM_EVENT_ROUTE_ERROR:
+               log_rdma_event(ERR, "connecting failed event=%s\n", event_name);
                info->ri_rc = -ENETUNREACH;
                complete(&info->ri_done);
                break;
 
        case RDMA_CM_EVENT_ESTABLISHED:
-               log_rdma_event(INFO, "connected event=%d\n", event->event);
+               log_rdma_event(INFO, "connected event=%s\n", event_name);
                sc->status = SMBDIRECT_SOCKET_CONNECTED;
                wake_up_interruptible(&info->conn_wait);
                break;
@@ -208,7 +211,7 @@ static int smbd_conn_upcall(
        case RDMA_CM_EVENT_CONNECT_ERROR:
        case RDMA_CM_EVENT_UNREACHABLE:
        case RDMA_CM_EVENT_REJECTED:
-               log_rdma_event(INFO, "connecting failed event=%d\n", event->event);
+               log_rdma_event(ERR, "connecting failed event=%s\n", event_name);
                sc->status = SMBDIRECT_SOCKET_DISCONNECTED;
                wake_up_interruptible(&info->conn_wait);
                break;
@@ -217,6 +220,7 @@ static int smbd_conn_upcall(
        case RDMA_CM_EVENT_DISCONNECTED:
                /* This happens when we fail the negotiation */
                if (sc->status == SMBDIRECT_SOCKET_NEGOTIATE_FAILED) {
+                       log_rdma_event(ERR, "event=%s during negotiation\n", event_name);
                        sc->status = SMBDIRECT_SOCKET_DISCONNECTED;
                        wake_up(&info->conn_wait);
                        break;
@@ -229,6 +233,8 @@ static int smbd_conn_upcall(
                break;
 
        default:
+               log_rdma_event(ERR, "unexpected event=%s status=%d\n",
+                              event_name, event->status);
                break;
        }