| Message ID | 1592439867-18427-4-git-send-email-bmarzins@redhat.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | christophe varoqui |
| Headers | show |
| Series | Fix muitpath/multipathd flush issue | expand |
On Wed, 2020-06-17 at 19:24 -0500, Benjamin Marzinski wrote: > dm_flush_maps() returned both 0 and 1 on error, depending on which > part > of the function it was in, but the caller was always treating 0 as a > success. Make dm_flush_maps() always return 1 on error and 0 on > success. > > Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> > --- > libmultipath/devmapper.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > Reviewed-by: Martin Wilck <mwilck@suse.com>
diff --git a/libmultipath/devmapper.c b/libmultipath/devmapper.c index b44f7545..682c0038 100644 --- a/libmultipath/devmapper.c +++ b/libmultipath/devmapper.c @@ -993,13 +993,13 @@ dm_flush_map_nopaths(const char * mapname, int deferred_remove) int dm_flush_maps (int retries) { - int r = 0; + int r = 1; struct dm_task *dmt; struct dm_names *names; unsigned next = 0; if (!(dmt = libmp_dm_task_create (DM_DEVICE_LIST))) - return 0; + return r; dm_task_no_open_count(dmt); @@ -1012,6 +1012,7 @@ int dm_flush_maps (int retries) if (!names->dev) goto out; + r = 0; do { r |= dm_suspend_and_flush_map(names->name, retries); next = names->next;
dm_flush_maps() returned both 0 and 1 on error, depending on which part of the function it was in, but the caller was always treating 0 as a success. Make dm_flush_maps() always return 1 on error and 0 on success. Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> --- libmultipath/devmapper.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)