Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

tools/lib/lockdep: Rename "trywlock" into "trywrlock"

This patch avoids that the following compiler warning is reported while
compiling the lockdep unit tests:

include/liblockdep/rwlock.h: In function 'liblockdep_pthread_rwlock_trywlock':
include/liblockdep/rwlock.h:66:9: warning: implicit declaration of function 'pthread_rwlock_trywlock'; did you mean 'pthread_rwlock_trywrlock'? [-Wimplicit-function-declaration]
return pthread_rwlock_trywlock(&lock->rwlock) == 0 ? 1 : 0;
^~~~~~~~~~~~~~~~~~~~~~~
pthread_rwlock_trywrlock

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sasha Levin <sasha.levin@oracle.com>
Cc: Sasha Levin <sashal@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Waiman Long <longman@redhat.com>
Cc: johannes.berg@intel.com
Cc: tj@kernel.org
Fixes: 5a52c9b480e0 ("liblockdep: Add public headers for pthread_rwlock_t implementation")
Link: https://lkml.kernel.org/r/20181207011148.251812-6-bvanassche@acm.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>

authored by

Bart Van Assche and committed by
Ingo Molnar
7f3c7952 2b28a860

+3 -3
+3 -3
tools/lib/lockdep/include/liblockdep/rwlock.h
··· 60 60 return pthread_rwlock_tryrdlock(&lock->rwlock) == 0 ? 1 : 0; 61 61 } 62 62 63 - static inline int liblockdep_pthread_rwlock_trywlock(liblockdep_pthread_rwlock_t *lock) 63 + static inline int liblockdep_pthread_rwlock_trywrlock(liblockdep_pthread_rwlock_t *lock) 64 64 { 65 65 lock_acquire(&lock->dep_map, 0, 1, 0, 1, NULL, (unsigned long)_RET_IP_); 66 - return pthread_rwlock_trywlock(&lock->rwlock) == 0 ? 1 : 0; 66 + return pthread_rwlock_trywrlock(&lock->rwlock) == 0 ? 1 : 0; 67 67 } 68 68 69 69 static inline int liblockdep_rwlock_destroy(liblockdep_pthread_rwlock_t *lock) ··· 79 79 #define pthread_rwlock_unlock liblockdep_pthread_rwlock_unlock 80 80 #define pthread_rwlock_wrlock liblockdep_pthread_rwlock_wrlock 81 81 #define pthread_rwlock_tryrdlock liblockdep_pthread_rwlock_tryrdlock 82 - #define pthread_rwlock_trywlock liblockdep_pthread_rwlock_trywlock 82 + #define pthread_rwlock_trywrlock liblockdep_pthread_rwlock_trywrlock 83 83 #define pthread_rwlock_destroy liblockdep_rwlock_destroy 84 84 85 85 #endif