[19/41] libmultipath: rename __unlock()

Commit Message

Martin Wilck Aug. 8, 2024, 3:25 p.m. UTC

Signed-off-by: Martin Wilck <[e-mail]>
---
 libmultipath/lock.c | 4 ++--
 libmultipath/lock.h | 2 +-
 multipathd/uxlsnr.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

Patch

diff --git a/libmultipath/lock.c b/libmultipath/lock.c
index 93b48db..4d18d82 100644
--- a/libmultipath/lock.c
+++ b/libmultipath/lock.c
@@ -5,7 +5,7 @@  void cleanup_lock (void * data)
 	struct mutex_lock *lock = data;
 	wakeup_fn *fn = lock->wakeup;
 
-	__unlock(lock);
+	unlock__(lock);
 	if (fn)
 		fn();
 }
@@ -14,5 +14,5 @@  void set_wakeup_fn(struct mutex_lock *lck, wakeup_fn *fn)
 {
 	lock(lck);
 	lck->wakeup = fn;
-	__unlock(lck);
+	unlock__(lck);
 }
diff --git a/libmultipath/lock.h b/libmultipath/lock.h
index 1c05a77..38473a8 100644
--- a/libmultipath/lock.h
+++ b/libmultipath/lock.h
@@ -50,7 +50,7 @@  static inline int timedlock(struct mutex_lock *a, struct timespec *tmo)
 	return pthread_mutex_timedlock(&a->mutex, tmo);
 }
 
-static inline void __unlock(struct mutex_lock *a)
+static inline void unlock__(struct mutex_lock *a)
 {
 	pthread_mutex_unlock(&a->mutex);
 }
diff --git a/multipathd/uxlsnr.c b/multipathd/uxlsnr.c
index 198f382..d74bb35 100644
--- a/multipathd/uxlsnr.c
+++ b/multipathd/uxlsnr.c
@@ -527,7 +527,7 @@  static int client_state_machine(struct client *c, struct vectors *vecs,
 	case CLT_LOCKED_WORK:
 		if (trylock(&vecs->lock) == 0) {
 			/* don't use cleanup_lock(), lest we wakeup ourselves */
-			pthread_cleanup_push_cast(__unlock, &vecs->lock);
+			pthread_cleanup_push_cast(unlock__, &vecs->lock);
 			c->error = execute_handler(c, vecs);
 			check_for_locked_work(c);
 			pthread_cleanup_pop(1);