From: Timothy Day Date: Sat, 8 Mar 2025 21:46:32 +0000 (-0500) Subject: LU-16518 lnet: fix implicit-fallthrough warnings X-Git-Tag: 2.16.55~123 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=refs%2Fchanges%2F49%2F58349%2F3;p=fs%2Flustre-release.git LU-16518 lnet: fix implicit-fallthrough warnings Explicitly lable switch-case intentional fallthroughs and reorder cases as needed to silence implicit-fallthrough warnings as reported by Clang. Test-Parameters: trivial Signed-off-by: Timothy Day Change-Id: If6550d97e9f49a6722f8e9a2ae34ba2338f39e73 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/58349 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Chris Horn Reviewed-by: James Simmons Reviewed-by: Oleg Drokin Reviewed-by: Andreas Dilger --- diff --git a/lnet/klnds/socklnd/socklnd.c b/lnet/klnds/socklnd/socklnd.c index aefca0c..3932f38 100644 --- a/lnet/klnds/socklnd/socklnd.c +++ b/lnet/klnds/socklnd/socklnd.c @@ -1077,8 +1077,6 @@ ksocknal_create_conn(struct lnet_ni *ni, struct ksock_conn_cb *conn_cb, } switch (rc) { - default: - LBUG(); case 0: break; case EALREADY: @@ -1087,6 +1085,8 @@ ksocknal_create_conn(struct lnet_ni *ni, struct ksock_conn_cb *conn_cb, case EPROTO: warn = "retry with different protocol version"; goto failed_2; + default: + LBUG(); } /* Refuse to duplicate an existing connection, unless this is a diff --git a/lnet/klnds/socklnd/socklnd_cb.c b/lnet/klnds/socklnd/socklnd_cb.c index d85b3c4..4bbf4e1 100644 --- a/lnet/klnds/socklnd/socklnd_cb.c +++ b/lnet/klnds/socklnd/socklnd_cb.c @@ -684,8 +684,6 @@ ksocknal_find_conn_locked(struct ksock_peer_ni *peer_ni, struct ksock_tx *tx, in rc = c->ksnc_proto->pro_match_tx(c, tx, nonblk); switch (rc) { - default: - LBUG(); case SOCKNAL_MATCH_NO: /* protocol rejected the tx */ continue; @@ -706,6 +704,8 @@ ksocknal_find_conn_locked(struct ksock_peer_ni *peer_ni, struct ksock_tx *tx, in fnob = nob; } break; + default: + LBUG(); } } diff --git a/lnet/klnds/socklnd/socklnd_proto.c b/lnet/klnds/socklnd/socklnd_proto.c index 1f41006..6115b19 100644 --- a/lnet/klnds/socklnd/socklnd_proto.c +++ b/lnet/klnds/socklnd/socklnd_proto.c @@ -281,9 +281,6 @@ ksocknal_match_tx(struct ksock_conn *conn, struct ksock_tx *tx, int nonblk) /* default checking for typed connection */ switch (conn->ksnc_type) { - default: - CERROR("ksnc_type bad: %u\n", conn->ksnc_type); - LBUG(); case SOCKLND_CONN_ANY: return SOCKNAL_MATCH_YES; @@ -301,6 +298,11 @@ ksocknal_match_tx(struct ksock_conn *conn, struct ksock_tx *tx, int nonblk) return SOCKNAL_MATCH_MAY; else return SOCKNAL_MATCH_YES; + + default: + CERROR("ksnc_type bad: %u\n", conn->ksnc_type); + LBUG(); + return SOCKNAL_MATCH_NO; } } @@ -317,9 +319,6 @@ ksocknal_match_tx_v3(struct ksock_conn *conn, struct ksock_tx *tx, int nonblk) tx->tx_lnetmsg->msg_len; switch (conn->ksnc_type) { - default: - CERROR("ksnc_type bad: %u\n", conn->ksnc_type); - LBUG(); case SOCKLND_CONN_ANY: return SOCKNAL_MATCH_NO; @@ -346,6 +345,11 @@ ksocknal_match_tx_v3(struct ksock_conn *conn, struct ksock_tx *tx, int nonblk) return SOCKNAL_MATCH_MAY; else return SOCKNAL_MATCH_YES; + + default: + CERROR("ksnc_type bad: %u\n", conn->ksnc_type); + LBUG(); + return SOCKNAL_MATCH_NO; } } @@ -362,9 +366,6 @@ ksocknal_match_tx_v4(struct ksock_conn *conn, struct ksock_tx *tx, int nonblk) tx->tx_lnetmsg->msg_len; switch (conn->ksnc_type) { - default: - CERROR("ksnc_type bad: %u\n", conn->ksnc_type); - LBUG(); case SOCKLND_CONN_ANY: return SOCKNAL_MATCH_NO; @@ -391,6 +392,11 @@ ksocknal_match_tx_v4(struct ksock_conn *conn, struct ksock_tx *tx, int nonblk) return SOCKNAL_MATCH_MAY; else return SOCKNAL_MATCH_YES; + + default: + CERROR("ksnc_type bad: %u\n", conn->ksnc_type); + LBUG(); + return SOCKNAL_MATCH_NO; } } diff --git a/lnet/lnet/api-ni.c b/lnet/lnet/api-ni.c index 43b0af9..1ea0ff1 100644 --- a/lnet/lnet/api-ni.c +++ b/lnet/lnet/api-ni.c @@ -1139,14 +1139,15 @@ static char * lnet_res_type2str(int type) { switch (type) { - default: - LBUG(); case LNET_COOKIE_TYPE_MD: return "MD"; case LNET_COOKIE_TYPE_ME: return "ME"; case LNET_COOKIE_TYPE_EQ: return "EQ"; + default: + LBUG(); + return NULL; } } @@ -6305,11 +6306,11 @@ lnet_genl_parse_local_ni(struct nlattr *entry, struct genl_info *info, GENL_SET_ERR_MSG(info, "invalid CPT set"); break; + case 0: + break; default: GENL_SET_ERR_MSG(info, "cannot add LNet NI"); - case 0: - break; } } else if (info->nlhdr->nlmsg_flags & NLM_F_REPLACE && healthv != -1) { lnet_ni_set_healthv(&nid, healthv); diff --git a/lnet/lnet/lib-move.c b/lnet/lnet/lib-move.c index 2b33310..49d2c6c 100644 --- a/lnet/lnet/lib-move.c +++ b/lnet/lnet/lib-move.c @@ -4440,9 +4440,6 @@ lnet_parse_put(struct lnet_ni *ni, struct lnet_msg *msg) again: rc = lnet_ptl_match_md(&info, msg); switch (rc) { - default: - LBUG(); - case LNET_MATCHMD_OK: lnet_recv_put(ni, msg); return 0; @@ -4467,6 +4464,10 @@ lnet_parse_put(struct lnet_ni *ni, struct lnet_msg *msg) info.mi_mbits, info.mi_roffset, info.mi_rlength, rc); return -ENOENT; /* -ve: OK but no match */ + + default: + LBUG(); + return -ENOENT; } } diff --git a/lnet/lnet/lib-msg.c b/lnet/lnet/lib-msg.c index f33031ed..f614fb2 100644 --- a/lnet/lnet/lib-msg.c +++ b/lnet/lnet/lib-msg.c @@ -70,9 +70,6 @@ lnet_build_msg_event(struct lnet_msg *msg, enum lnet_event_kind ev_type) } switch (ev_type) { - default: - LBUG(); - case LNET_EVENT_PUT: /* passive PUT */ ev->pt_index = hdr->msg.put.ptl_index; ev->match_bits = hdr->msg.put.match_bits; @@ -112,6 +109,9 @@ lnet_build_msg_event(struct lnet_msg *msg, enum lnet_event_kind ev_type) ev->hdr_data = 0; } return; + + default: + LBUG(); } }