From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Benjamin Marzinski Date: Tue, 31 Jan 2023 10:35:10 -0600 Subject: [PATCH] libmultipath: cleanup ACT_CREATE code in select_action Combine the two separate blocks that set ACT_CREATE into one. Signed-off-by: Benjamin Marzinski --- libmultipath/configure.c | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/libmultipath/configure.c b/libmultipath/configure.c index ecf24f95..303d2380 100644 --- a/libmultipath/configure.c +++ b/libmultipath/configure.c @@ -693,33 +693,29 @@ select_action (struct multipath * mpp, vector curmp, int force_reload) cmpp = find_mp_by_wwid(curmp, mpp->wwid); cmpp_by_name = find_mp_by_alias(curmp, mpp->alias); - if (!cmpp_by_name) { - if (cmpp) { - condlog(2, "%s: rename %s to %s", mpp->wwid, - cmpp->alias, mpp->alias); - strlcpy(mpp->alias_old, cmpp->alias, WWID_SIZE); - mpp->action = ACT_RENAME; - if (force_reload) { - mpp->force_udev_reload = 1; - mpp->action = ACT_FORCERENAME; - } - return; + if (!cmpp) { + if (cmpp_by_name) { + condlog(1, "%s: can't use alias \"%s\" used by %s, falling back to WWID", + mpp->wwid, mpp->alias, cmpp_by_name->wwid); + /* We can do this because wwid wasn't found */ + free(mpp->alias); + mpp->alias = strdup(mpp->wwid); } mpp->action = ACT_CREATE; - condlog(3, "%s: set ACT_CREATE (map does not exist)", - mpp->alias); + condlog(3, "%s: set ACT_CREATE (map does not exist%s)", + mpp->alias, cmpp_by_name ? ", name changed" : ""); return; } - if (!cmpp) { - condlog(1, "%s: can't use alias \"%s\" used by %s, falling back to WWID", - mpp->wwid, mpp->alias, cmpp_by_name->wwid); - /* We can do this because wwid wasn't found */ - free(mpp->alias); - mpp->alias = strdup(mpp->wwid); - mpp->action = ACT_CREATE; - condlog(3, "%s: set ACT_CREATE (map does not exist, name changed)", + if (!cmpp_by_name) { + condlog(2, "%s: rename %s to %s", mpp->wwid, cmpp->alias, mpp->alias); + strlcpy(mpp->alias_old, cmpp->alias, WWID_SIZE); + mpp->action = ACT_RENAME; + if (force_reload) { + mpp->force_udev_reload = 1; + mpp->action = ACT_FORCERENAME; + } return; }