dmraid/remove_trylock
OBS User autobuild b93ae46f77 Accepting request 39527 from Base:System
Copy from Base:System/dmraid based on submit request 39527 from user neilbrown

OBS-URL: https://build.opensuse.org/request/show/39527
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dmraid?expand=0&rev=30
2010-05-07 13:41:54 +00:00

36 lines
1.1 KiB
Plaintext

Remove call to pthreads_mutex_trylock
Reference bnc
594388
This appears only to be in very recent releases of glibc.
Its presence causes
/sbin/dmraid -ay -p
The dynamic shared library "libdmraid-events-isw.so" could not be loaded:
/lib/libdmraid-events-isw.so: undefined symbol: pthread_mutex_trylock
on openSUSE 11.3, it is is not used for anything except a simple
logging message.
Signed-off-by: NeilBrown <neilb@suse.de>
---
1.0.0.rc16/lib/events/libdmraid-events-isw.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
--- dmraid.orig/1.0.0.rc16/lib/events/libdmraid-events-isw.c
+++ dmraid/1.0.0.rc16/lib/events/libdmraid-events-isw.c
@@ -1433,11 +1433,7 @@ void process_event(struct dm_task *dmt,
/*
* Make sure, events are processed sequentially per RAID set.
*/
- if (pthread_mutex_trylock(&rs->event_mutex)) {
- syslog(LOG_NOTICE,
- " Another thread is handling an event. Waiting...");
- pthread_mutex_lock(&rs->event_mutex);
- }
+ pthread_mutex_lock(&rs->event_mutex);
do {
next = dm_get_next_target(dmt, next, &start, &length,