From 4062358004e6b0531f44715085bce1c97d570feb Mon Sep 17 00:00:00 2001 From: Timothy Day Date: Mon, 13 May 2024 03:51:16 +0000 Subject: [PATCH] LU-17844 lnds: remove a few LCONSOLE_ERROR_MSG() I doubt these magic numbers help anyone. Test-Parameters: trivial Signed-off-by: Timothy Day Change-Id: I7c2505ec0eb7fc6524a13d4bf330a72188a26b4e Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/55085 Reviewed-by: Andreas Dilger Reviewed-by: Arshad Hussain Reviewed-by: James Simmons Reviewed-by: Chris Horn Reviewed-by: Oleg Drokin Tested-by: jenkins Tested-by: Maloo --- lnet/klnds/o2iblnd/o2iblnd_cb.c | 13 ++++++------- lnet/klnds/socklnd/socklnd.c | 5 ++--- lnet/klnds/socklnd/socklnd_cb.c | 9 ++++----- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/lnet/klnds/o2iblnd/o2iblnd_cb.c b/lnet/klnds/o2iblnd/o2iblnd_cb.c index 6ad06f8..b05eb12 100644 --- a/lnet/klnds/o2iblnd/o2iblnd_cb.c +++ b/lnet/klnds/o2iblnd/o2iblnd_cb.c @@ -3495,13 +3495,12 @@ kiblnd_cm_callback(struct rdma_cm_id *cmid, struct rdma_cm_event *event) cmid->context = NULL; return 0; - case RDMA_CM_EVENT_DEVICE_REMOVAL: - LCONSOLE_ERROR_MSG(0x131, - "Received notification of device removal\n" - "Please shutdown LNET to allow this to proceed\n"); - /* Can't remove network from underneath LNET for now, so I have - * to ignore this */ - return 0; + case RDMA_CM_EVENT_DEVICE_REMOVAL: + LCONSOLE_ERROR("Received notification of device removal - Please shutdown LNET to allow this to proceed\n"); + /* Can't remove network from underneath LNET for now, so I have + * to ignore this + */ + return 0; case RDMA_CM_EVENT_ADDR_CHANGE: LCONSOLE_INFO("Physical link changed (eg hca/port)\n"); diff --git a/lnet/klnds/socklnd/socklnd.c b/lnet/klnds/socklnd/socklnd.c index 0a89ead..36f5104 100644 --- a/lnet/klnds/socklnd/socklnd.c +++ b/lnet/klnds/socklnd/socklnd.c @@ -761,9 +761,8 @@ ksocknal_accept(struct lnet_ni *ni, struct socket *sock) LIBCFS_ALLOC(cr, sizeof(*cr)); if (cr == NULL) { - LCONSOLE_ERROR_MSG(0x12f, - "Dropping connection request from %pISc: memory exhausted\n", - &peer); + LCONSOLE_ERROR("Dropping connection request from %pISc: memory exhausted\n", + &peer); return -ENOMEM; } diff --git a/lnet/klnds/socklnd/socklnd_cb.c b/lnet/klnds/socklnd/socklnd_cb.c index 6e361b6..63ea497 100644 --- a/lnet/klnds/socklnd/socklnd_cb.c +++ b/lnet/klnds/socklnd/socklnd_cb.c @@ -1896,11 +1896,10 @@ out_fatal: if (peerid->pid != recv_id.pid || !nid_same(&peerid->nid, &recv_id.nid)) { - LCONSOLE_ERROR_MSG(0x130, - "Connected successfully to %s on host %pISc, but they claimed they were %s; please check your Lustre configuration.\n", - libcfs_idstr(peerid), - &conn->ksnc_peeraddr, - libcfs_idstr(&recv_id)); + LCONSOLE_ERROR("Connected successfully to %s on host %pISc, but they claimed they were %s; please check your Lustre configuration.\n", + libcfs_idstr(peerid), + &conn->ksnc_peeraddr, + libcfs_idstr(&recv_id)); return -EPROTO; } -- 1.8.3.1