Fix up bogon and missing log entries from .pmachata.threads branch.

1 files changed, 2 insertions, 28 deletions

diff --git a/libelf/common.h b/libelf/common.h
index c00bfbc5..8eef2a7a 100644
--- a/libelf/common.h
+++ b/libelf/common.h
@@ -118,7 +118,7 @@ static void
 __attribute__ ((unused))
 libelf_acquire_all (Elf *elf)
 {
-  RWLOCK_WRLOCK (elf->lock);
+  rwlock_wrlock (elf->lock);
 
   if (elf->kind == ELF_K_AR)
     {
@@ -150,33 +150,7 @@ libelf_release_all (Elf *elf)
 	}
     }
 
-  RWLOCK_UNLOCK (elf->lock);
-}
-
-/* Convert given lock LOCK with lock state FROM to lock state
-   LS_WRLOCKED. */
-static void
-__attribute__ ((unused))
-rwlock_to_wrlock(lockstat_t from, rwlock_define (,*lock))
-{
-  if (from == LS_WRLOCKED)
-    return;
-  if (from == LS_RDLOCKED)
-    RWLOCK_UNLOCK (*lock);
-  RWLOCK_WRLOCK (*lock);
-}
-
-/* Convert given lock LOCK with lock state LS_WRLOCKED to lock state
-   TO. */
-static void
-__attribute__ ((unused))
-rwlock_from_wrlock(lockstat_t to, rwlock_define (,*lock))
-{
-  if (to == LS_WRLOCKED)
-    return;
-  RWLOCK_UNLOCK (*lock);
-  if (to == LS_RDLOCKED)
-    RWLOCK_RDLOCK (*lock);
+  rwlock_unlock (elf->lock);
 }