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 <bmarz...@redhat.com>
---
 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 1bb62531..ae0defc2 100644
--- a/libmpathpersist/mpath_persist_int.c
+++ b/libmpathpersist/mpath_persist_int.c
@@ -729,15 +729,19 @@ int do_mpath_persistent_reserve_out(vector curmp, vector 
pathvec, int fd,
                return MPATH_PR_OTHER;
        }
 
-       if ((ret == MPATH_PR_SUCCESS) && ((rq_servact == MPATH_PROUT_REG_SA) ||
-                               (rq_servact ==  MPATH_PROUT_REG_IGN_SA)))
-       {
+       if (ret != MPATH_PR_SUCCESS)
+               return ret;
+
+       switch (rq_servact) {
+       case MPATH_PROUT_REG_SA:
+       case MPATH_PROUT_REG_IGN_SA:
                if (prkey == 0) {
                        update_prflag(mpp->alias, 0);
                        update_prkey(mpp->alias, 0);
                } else
                        update_prflag(mpp->alias, 1);
-       } else if ((ret == MPATH_PR_SUCCESS) && (rq_servact == 
MPATH_PROUT_CLEAR_SA)) {
+               break;
+       case MPATH_PROUT_CLEAR_SA:
                update_prflag(mpp->alias, 0);
                update_prkey(mpp->alias, 0);
        }
-- 
2.48.1


Reply via email to