Skip to contentSkip to conversation

Latest git -master is not compilable]

PATCH In review Christophe Varoqui 2 participants 2 messages Feb 6, 2010 – Feb 8, 2010 Device mapper

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Latest git -master is not compilable]

Can you confirm the fix from Rumko does not break your ulibc setup ?

Signature · 2 lines
cvaroqui,
http://www.opensvc.com

Hi!

In latest git -master on line 1443 of multipathd/main.c lock() is called on exit_mutex, but since exit_mutex is a pthread_mutex_t, pthread_mutex_lock() is needed.

Attached is the one-liner patch, tested it on a gentoo machine and seems to be working.

Signature · 2 lines
Regards,
Rumko

From a6bf54d588c2d0c9d3a97541bcb7b605fd1f3ae0 Mon Sep 17 00:00:00 2001
From: Rumko <[email protected]>
Date: Fri, 5 Feb 2010 20:59:21 +0100
Subject: [PATCH] Use pthread_mutex_lock() instead of lock() since we are dealing with a
mutex directly.

---
 multipathd/main.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
multipathd/main.c +1 -1
index e7955bd..3f7eb49 100644
@@ -1440,7 +1440,7 @@ child (void * param)
 	pthread_create(&uxlsnr_thr, &misc_attr, uxlsnrloop, vecs);
 	pthread_attr_destroy(&misc_attr);
 
-	lock(&exit_mutex);
+	pthread_mutex_lock(&exit_mutex);
 	pthread_cond_wait(&exit_cond, &exit_mutex);
 
 	/*
Signature · 1 line
1.6.6
#1 lore raw

The lock() macro is defined in libmultipath/lock.h and just invokes pthread_mutex_lock() so there'll be no problem replacing the call to lock() with a call to pthread_mutex_lock().

In the version I was patching (0.4.7) the macros were used everywhere, but in the latest git master it looks like pthread library calls are invoked directly.
Please change it if it makes the style more consistent.

Regards,

Alex

Quoted 25 lines · Christophe Varoqui

Can you confirm the fix from Rumko does not break your ulibc setup ?

------------------------------------------------------------------------

Subject:
[PATCH] Latest git -master is not compilable
From:
Rumko <[email protected]>
Date:
Fri, 5 Feb 2010 20:02:23 +0000
To:
"[email protected]" <[email protected]>

To:
"[email protected]" <[email protected]>

Hi!

In latest git -master on line 1443 of multipathd/main.c lock() is called on exit_mutex, but since exit_mutex is a pthread_mutex_t, pthread_mutex_lock() is needed.

Attached is the one-liner patch, tested it on a gentoo machine and seems to be working.