The code to flush a multipath device because all of its paths have been removed will be used by another caller, so factor it out of ev_remove_path().
Signed-off-by: Benjamin Marzinski <bmarz...@redhat.com> --- multipathd/main.c | 56 ++++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/multipathd/main.c b/multipathd/main.c index 5c2a7272..325f8cd4 100644 --- a/multipathd/main.c +++ b/multipathd/main.c @@ -561,6 +561,30 @@ int update_multipath (struct vectors *vecs, char *mapname, int reset) return 0; } +static bool +flush_map_nopaths(struct multipath *mpp, struct vectors *vecs) { + char alias[WWID_SIZE]; + + /* + * flush_map will fail if the device is open + */ + strlcpy(alias, mpp->alias, WWID_SIZE); + if (mpp->flush_on_last_del == FLUSH_ENABLED) { + condlog(2, "%s Last path deleted, disabling queueing", + mpp->alias); + mpp->retry_tick = 0; + mpp->no_path_retry = NO_PATH_RETRY_FAIL; + mpp->disable_queueing = 1; + mpp->stat_map_failures++; + dm_queue_if_no_path(mpp->alias, 0); + } + if (!flush_map(mpp, vecs, 1)) { + condlog(2, "%s: removed map after removing all paths", alias); + return true; + } + return false; +} + static int update_map (struct multipath *mpp, struct vectors *vecs, int new_map) { @@ -1351,34 +1375,12 @@ ev_remove_path (struct path *pp, struct vectors * vecs, int need_do_map) vector_del_slot(mpp->paths, i); /* - * remove the map IF removing the last path + * remove the map IF removing the last path. If + * flush_map_nopaths succeeds, the path has been removed. */ - if (VECTOR_SIZE(mpp->paths) == 0) { - char alias[WWID_SIZE]; - - /* - * flush_map will fail if the device is open - */ - strlcpy(alias, mpp->alias, WWID_SIZE); - if (mpp->flush_on_last_del == FLUSH_ENABLED) { - condlog(2, "%s Last path deleted, disabling queueing", mpp->alias); - mpp->retry_tick = 0; - mpp->no_path_retry = NO_PATH_RETRY_FAIL; - mpp->disable_queueing = 1; - mpp->stat_map_failures++; - dm_queue_if_no_path(mpp->alias, 0); - } - if (!flush_map(mpp, vecs, 1)) { - condlog(2, "%s: removed map after" - " removing all paths", - alias); - /* flush_map() has freed the path */ - goto out; - } - /* - * Not an error, continue - */ - } + if (VECTOR_SIZE(mpp->paths) == 0 && + flush_map_nopaths(mpp, vecs)) + goto out; if (setup_map(mpp, ¶ms, vecs)) { condlog(0, "%s: failed to setup map for" -- 2.17.2 -- dm-devel mailing list dm-devel@redhat.com https://listman.redhat.com/mailman/listinfo/dm-devel