From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Benjamin Marzinski Date: Thu, 10 Jul 2025 14:10:59 -0400 Subject: [PATCH] libmpathpersist: use a switch statement for prout command finalizing Change the code at the end of do_mpath_persistent_reserve_out() to use a switch statement instead of multiple if statements. A future patch will add more actions here, and a switch statement looks cleaner. Signed-off-by: Benjamin Marzinski Reviewed-by: Martin Wilck --- libmpathpersist/mpath_persist_int.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libmpathpersist/mpath_persist_int.c b/libmpathpersist/mpath_persist_int.c index d596b5bd..679e82be 100644 --- a/libmpathpersist/mpath_persist_int.c +++ b/libmpathpersist/mpath_persist_int.c @@ -744,15 +744,19 @@ int do_mpath_persistent_reserve_out(vector curmp, vector pathvec, int fd, goto out1; } - if ((ret == MPATH_PR_SUCCESS) && ((rq_servact == MPATH_PROUT_REG_SA) || - (rq_servact == MPATH_PROUT_REG_IGN_SA))) - { + if (ret != MPATH_PR_SUCCESS) + goto out1; + + switch (rq_servact) { + case MPATH_PROUT_REG_SA: + case MPATH_PROUT_REG_IGN_SA: if (prkey == 0) { update_prflag(alias, 0); update_prkey(alias, 0); } else update_prflag(alias, 1); - } else if ((ret == MPATH_PR_SUCCESS) && (rq_servact == MPATH_PROUT_CLEAR_SA)) { + break; + case MPATH_PROUT_CLEAR_SA: update_prflag(alias, 0); update_prkey(alias, 0); }