[Fwd: [PATCH] Latest git -master is not compilable]

[Fwd: [PATCH] Latest git -master is not compilable]

[Christophe Varoqui]

[-- Attachment #1: Type: text/plain, Size: 107 bytes --]

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

-- 
cvaroqui,
http://www.opensvc.com

[-- Attachment #2: Forwarded message - [PATCH] Latest git -master is not compilable --]
[-- Type: message/rfc822, Size: 5296 bytes --]

[-- Attachment #2.1.1.1: Type: text/plain, Size: 290 bytes --]

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.
-- 
Regards,
Rumko

[-- Attachment #2.1.1.2: 0001-Use-pthread_mutex_lock-instead-of-lock-since-we-are-.patch --]
[-- Type: text/x-diff, Size: 746 bytes --]

From a6bf54d588c2d0c9d3a97541bcb7b605fd1f3ae0 Mon Sep 17 00:00:00 2001
From: Rumko <rumcic@gmail.com>
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(-)

diff --git a/multipathd/main.c b/multipathd/main.c
index e7955bd..3f7eb49 100644
--- a/multipathd/main.c
+++ b/multipathd/main.c
@@ -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);
 
 	/*
-- 
1.6.6


[-- Attachment #2.1.2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

[-- Attachment #3: Type: text/plain, Size: 0 bytes --]

Re: [Fwd: [PATCH] Latest git -master is not compilable]

[Alex Zeffertt]

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


Christophe Varoqui wrote:
> Can you confirm the fix from Rumko does not break your ulibc setup ?
> 
> 
> 
> ------------------------------------------------------------------------
> 
> Subject:
> [PATCH] Latest git -master is not compilable
> From:
> Rumko <rumcic@gmail.com>
> Date:
> Fri, 5 Feb 2010 20:02:23 +0000
> To:
> "christophe.varoqui@opensvc.com" <christophe.varoqui@opensvc.com>
> 
> To:
> "christophe.varoqui@opensvc.com" <christophe.varoqui@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.
>