| Message ID | 20240423222536.2096486-2-bmarzins@redhat.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | Benjamin Marzinski |
| Headers | show |
| Series | multipath: fix hang in flush_map_nopaths | expand |
On Tue, 2024-04-23 at 18:25 -0400, Benjamin Marzinski wrote: > A future commit will make use of these functions > > Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> Reviewed-by: Martin Wilck <mwilck@suse.com> > --- > libmultipath/devmapper.c | 4 +--- > libmultipath/devmapper.h | 3 +++ > libmultipath/libmultipath.version | 1 + > 3 files changed, 5 insertions(+), 3 deletions(-) > > diff --git a/libmultipath/devmapper.c b/libmultipath/devmapper.c > index 4ce7e82f..24d03e83 100644 > --- a/libmultipath/devmapper.c > +++ b/libmultipath/devmapper.c > @@ -386,8 +386,6 @@ libmp_dm_task_create(int task) > return dm_task_create(task); > } > > -#define do_deferred(x) ((x) == DEFERRED_REMOVE_ON || (x) == > DEFERRED_REMOVE_IN_PROGRESS) > - > static int > dm_simplecmd (int task, const char *name, int no_flush, int > need_sync, > uint16_t udev_flags, int deferred_remove > __DR_UNUSED__) { > @@ -1043,7 +1041,7 @@ has_partmap(const char *name > __attribute__((unused)), > return 1; > } > > -static int > +int > partmap_in_use(const char *name, void *data) > { > int part_count, *ret_count = (int *)data; > diff --git a/libmultipath/devmapper.h b/libmultipath/devmapper.h > index a7d66604..2987a1b5 100644 > --- a/libmultipath/devmapper.h > +++ b/libmultipath/devmapper.h > @@ -57,6 +57,9 @@ enum { > DM_FLUSH_BUSY, > }; > > +#define do_deferred(x) ((x) == DEFERRED_REMOVE_ON || (x) == > DEFERRED_REMOVE_IN_PROGRESS) > + > +int partmap_in_use(const char *name, void *data); > int _dm_flush_map (const char *, int, int, int, int); > int dm_flush_map_nopaths(const char * mapname, int deferred_remove); > #define dm_flush_map(mapname) _dm_flush_map(mapname, 1, 0, 0, 0) > diff --git a/libmultipath/libmultipath.version > b/libmultipath/libmultipath.version > index 724786d5..e070f296 100644 > --- a/libmultipath/libmultipath.version > +++ b/libmultipath/libmultipath.version > @@ -141,6 +141,7 @@ global: > need_io_err_check; > orphan_path; > parse_prkey_flags; > + partmap_in_use; > pathcount; > path_discovery; > path_get_tpgs;
On Tue, 2024-04-23 at 18:25 -0400, Benjamin Marzinski wrote: > A future commit will make use of these functions > > Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> > --- > libmultipath/devmapper.c | 4 +--- > libmultipath/devmapper.h | 3 +++ > libmultipath/libmultipath.version | 1 + > 3 files changed, 5 insertions(+), 3 deletions(-) > Reviewed-by: Martin Wilck <mwilck@suse.com>
diff --git a/libmultipath/devmapper.c b/libmultipath/devmapper.c index 4ce7e82f..24d03e83 100644 --- a/libmultipath/devmapper.c +++ b/libmultipath/devmapper.c @@ -386,8 +386,6 @@ libmp_dm_task_create(int task) return dm_task_create(task); } -#define do_deferred(x) ((x) == DEFERRED_REMOVE_ON || (x) == DEFERRED_REMOVE_IN_PROGRESS) - static int dm_simplecmd (int task, const char *name, int no_flush, int need_sync, uint16_t udev_flags, int deferred_remove __DR_UNUSED__) { @@ -1043,7 +1041,7 @@ has_partmap(const char *name __attribute__((unused)), return 1; } -static int +int partmap_in_use(const char *name, void *data) { int part_count, *ret_count = (int *)data; diff --git a/libmultipath/devmapper.h b/libmultipath/devmapper.h index a7d66604..2987a1b5 100644 --- a/libmultipath/devmapper.h +++ b/libmultipath/devmapper.h @@ -57,6 +57,9 @@ enum { DM_FLUSH_BUSY, }; +#define do_deferred(x) ((x) == DEFERRED_REMOVE_ON || (x) == DEFERRED_REMOVE_IN_PROGRESS) + +int partmap_in_use(const char *name, void *data); int _dm_flush_map (const char *, int, int, int, int); int dm_flush_map_nopaths(const char * mapname, int deferred_remove); #define dm_flush_map(mapname) _dm_flush_map(mapname, 1, 0, 0, 0) diff --git a/libmultipath/libmultipath.version b/libmultipath/libmultipath.version index 724786d5..e070f296 100644 --- a/libmultipath/libmultipath.version +++ b/libmultipath/libmultipath.version @@ -141,6 +141,7 @@ global: need_io_err_check; orphan_path; parse_prkey_flags; + partmap_in_use; pathcount; path_discovery; path_get_tpgs;
A future commit will make use of these functions Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> --- libmultipath/devmapper.c | 4 +--- libmultipath/devmapper.h | 3 +++ libmultipath/libmultipath.version | 1 + 3 files changed, 5 insertions(+), 3 deletions(-)