From ae8dbf7f37f3e8876f8587b59ae971825a0fd32a Mon Sep 17 00:00:00 2001 From: Timothy Day Date: Sat, 8 Mar 2025 13:33:28 -0500 Subject: [PATCH] LU-16518 lst: fix switch-case unannotated fall-through (2) Fix more unannotated fall-through errors reported by Clang, by moving the default case to the end of the switch-case statement. Test-Parameters: trivial Signed-off-by: Timothy Day Change-Id: I12fb3bf709f2edd6ef03f58c122255319dc91049 --- lnet/selftest/framework.c | 4 ++-- lnet/selftest/rpc.c | 4 ++-- lnet/selftest/selftest.h | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lnet/selftest/framework.c b/lnet/selftest/framework.c index 9bec7f5..765ce67 100644 --- a/lnet/selftest/framework.c +++ b/lnet/selftest/framework.c @@ -1293,8 +1293,6 @@ sfw_handle_server_rpc(struct srpc_server_rpc *rpc) } switch (sv->sv_id) { - default: - LBUG(); case SRPC_SERVICE_TEST: rc = sfw_add_test(rpc); break; @@ -1323,6 +1321,8 @@ sfw_handle_server_rpc(struct srpc_server_rpc *rpc) rc = sfw_remove_session(&request->msg_body.rmsn_reqst, &reply->msg_body.rmsn_reply); break; + default: + LASSERTF(0, "sv_id bad %u\n", sv->sv_id); } if (sfw_data.fw_session != NULL) diff --git a/lnet/selftest/rpc.c b/lnet/selftest/rpc.c index d2893b8..615c25e 100644 --- a/lnet/selftest/rpc.c +++ b/lnet/selftest/rpc.c @@ -1219,8 +1219,6 @@ srpc_send_rpc(struct swi_workitem *wi) spin_unlock(&rpc->crpc_lock); switch (wi->swi_state) { - default: - LBUG(); case SWI_STATE_NEWBORN: LASSERT(!srpc_event_pending(rpc)); @@ -1304,6 +1302,8 @@ srpc_send_rpc(struct swi_workitem *wi) wi->swi_state = SWI_STATE_DONE; srpc_client_rpc_done(rpc, rc); return; + default: + LASSERTF(0, "swi_state bad %u\n", wi->swi_state); } if (rc != 0) { diff --git a/lnet/selftest/selftest.h b/lnet/selftest/selftest.h index 1467e926..a12f306 100644 --- a/lnet/selftest/selftest.h +++ b/lnet/selftest/selftest.h @@ -632,8 +632,6 @@ swi_state2str(int state) { #define STATE2STR(x) case x: return #x switch (state) { - default: - LBUG(); STATE2STR(SWI_STATE_NEWBORN); STATE2STR(SWI_STATE_REPLY_SUBMITTED); STATE2STR(SWI_STATE_REPLY_SENT); @@ -642,6 +640,9 @@ swi_state2str(int state) STATE2STR(SWI_STATE_REPLY_RECEIVED); STATE2STR(SWI_STATE_BULK_STARTED); STATE2STR(SWI_STATE_DONE); + default: + LASSERTF(0, "state bad %u\n", state); + return NULL; } #undef STATE2STR } -- 1.8.3.1