diff mbox series

[26/41] libmultipath: rename _dm_flush_map() to dm_flush_map__()

Message ID 20240808152620.93965-27-mwilck@suse.com (mailing list archive)
State Not Applicable, archived
Delegated to: christophe varoqui
Headers show
Series multipath-tools: comply with C library reserved names | expand

Commit Message

Martin Wilck Aug. 8, 2024, 3:26 p.m. UTC
Signed-off-by: Martin Wilck <mwilck@suse.com>
---
 libmultipath/devmapper.c          | 4 ++--
 libmultipath/devmapper.h          | 8 ++++----
 libmultipath/libmultipath.version | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)
diff mbox series

Patch

diff --git a/libmultipath/devmapper.c b/libmultipath/devmapper.c
index 0a4b586..c497c22 100644
--- a/libmultipath/devmapper.c
+++ b/libmultipath/devmapper.c
@@ -965,7 +965,7 @@  int mpath_in_use(const char *name)
 	return 0;
 }
 
-int _dm_flush_map (const char *mapname, int flags, int retries)
+int dm_flush_map__ (const char *mapname, int flags, int retries)
 {
 	int r;
 	int queue_if_no_path = 0;
@@ -1050,7 +1050,7 @@  dm_flush_map_nopaths(const char *mapname, int deferred_remove DR_UNUSED__)
 		   deferred_remove == DEFERRED_REMOVE_IN_PROGRESS) ?
 		  DMFL_DEFERRED : 0);
 #endif
-	return _dm_flush_map(mapname, flags, 0);
+	return dm_flush_map__(mapname, flags, 0);
 }
 
 int dm_flush_maps(int retries)
diff --git a/libmultipath/devmapper.h b/libmultipath/devmapper.h
index d9c08fd..ba05e0a 100644
--- a/libmultipath/devmapper.h
+++ b/libmultipath/devmapper.h
@@ -161,11 +161,11 @@  enum {
 	DMFL_NO_FLUSH  = 1 << 3,
 };
 
-int _dm_flush_map (const char *mapname, int flags, int retries);
-#define dm_flush_map(mapname) _dm_flush_map(mapname, DMFL_NEED_SYNC, 0)
-#define dm_flush_map_nosync(mapname) _dm_flush_map(mapname, DMFL_NONE, 0)
+int dm_flush_map__ (const char *mapname, int flags, int retries);
+#define dm_flush_map(mapname) dm_flush_map__(mapname, DMFL_NEED_SYNC, 0)
+#define dm_flush_map_nosync(mapname) dm_flush_map__(mapname, DMFL_NONE, 0)
 #define dm_suspend_and_flush_map(mapname, retries) \
-	_dm_flush_map(mapname, DMFL_NEED_SYNC|DMFL_SUSPEND, retries)
+	dm_flush_map__(mapname, DMFL_NEED_SYNC|DMFL_SUSPEND, retries)
 int dm_flush_map_nopaths(const char * mapname, int deferred_remove);
 int dm_cancel_deferred_remove(struct multipath *mpp);
 int dm_flush_maps (int retries);
diff --git a/libmultipath/libmultipath.version b/libmultipath/libmultipath.version
index e6c6daf..f92f759 100644
--- a/libmultipath/libmultipath.version
+++ b/libmultipath/libmultipath.version
@@ -75,7 +75,7 @@  global:
 	dm_enablegroup;
 	dm_fail_path;
 	dm_find_map_by_wwid;
-	_dm_flush_map;
+	dm_flush_map__;
 	dm_flush_map_nopaths;
 	dm_flush_maps;
 	dm_geteventnr;