mirror of
https://github.com/torvalds/linux.git
synced 2024-12-27 13:22:23 +00:00
5facae4f35
Since the following commit:
b4adfe8e05
("locking/lockdep: Remove unused argument in __lock_release")
@nested is no longer used in lock_release(), so remove it from all
lock_release() calls and friends.
Signed-off-by: Qian Cai <cai@lca.pw>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Will Deacon <will@kernel.org>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: airlied@linux.ie
Cc: akpm@linux-foundation.org
Cc: alexander.levin@microsoft.com
Cc: daniel@iogearbox.net
Cc: davem@davemloft.net
Cc: dri-devel@lists.freedesktop.org
Cc: duyuyang@gmail.com
Cc: gregkh@linuxfoundation.org
Cc: hannes@cmpxchg.org
Cc: intel-gfx@lists.freedesktop.org
Cc: jack@suse.com
Cc: jlbec@evilplan.or
Cc: joonas.lahtinen@linux.intel.com
Cc: joseph.qi@linux.alibaba.com
Cc: jslaby@suse.com
Cc: juri.lelli@redhat.com
Cc: maarten.lankhorst@linux.intel.com
Cc: mark@fasheh.com
Cc: mhocko@kernel.org
Cc: mripard@kernel.org
Cc: ocfs2-devel@oss.oracle.com
Cc: rodrigo.vivi@intel.com
Cc: sean@poorly.run
Cc: st@kernel.org
Cc: tj@kernel.org
Cc: tytso@mit.edu
Cc: vdavydov.dev@gmail.com
Cc: vincent.guittot@linaro.org
Cc: viro@zeniv.linux.org.uk
Link: https://lkml.kernel.org/r/1568909380-32199-1-git-send-email-cai@lca.pw
Signed-off-by: Ingo Molnar <mingo@kernel.org>
74 lines
2.2 KiB
C
74 lines
2.2 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef _LIBLOCKDEP_MUTEX_H
|
|
#define _LIBLOCKDEP_MUTEX_H
|
|
|
|
#include <pthread.h>
|
|
#include "common.h"
|
|
|
|
struct liblockdep_pthread_mutex {
|
|
pthread_mutex_t mutex;
|
|
struct lock_class_key key;
|
|
struct lockdep_map dep_map;
|
|
};
|
|
|
|
typedef struct liblockdep_pthread_mutex liblockdep_pthread_mutex_t;
|
|
|
|
#define LIBLOCKDEP_PTHREAD_MUTEX_INITIALIZER(mtx) \
|
|
(const struct liblockdep_pthread_mutex) { \
|
|
.mutex = PTHREAD_MUTEX_INITIALIZER, \
|
|
.dep_map = STATIC_LOCKDEP_MAP_INIT(#mtx, &((&(mtx))->dep_map)), \
|
|
}
|
|
|
|
static inline int __mutex_init(liblockdep_pthread_mutex_t *lock,
|
|
const char *name,
|
|
struct lock_class_key *key,
|
|
const pthread_mutexattr_t *__mutexattr)
|
|
{
|
|
lockdep_init_map(&lock->dep_map, name, key, 0);
|
|
return pthread_mutex_init(&lock->mutex, __mutexattr);
|
|
}
|
|
|
|
#define liblockdep_pthread_mutex_init(mutex, mutexattr) \
|
|
({ \
|
|
lockdep_register_key(&(mutex)->key); \
|
|
__mutex_init((mutex), #mutex, &(mutex)->key, (mutexattr)); \
|
|
})
|
|
|
|
static inline int liblockdep_pthread_mutex_lock(liblockdep_pthread_mutex_t *lock)
|
|
{
|
|
lock_acquire(&lock->dep_map, 0, 0, 0, 1, NULL, (unsigned long)_RET_IP_);
|
|
return pthread_mutex_lock(&lock->mutex);
|
|
}
|
|
|
|
static inline int liblockdep_pthread_mutex_unlock(liblockdep_pthread_mutex_t *lock)
|
|
{
|
|
lock_release(&lock->dep_map, (unsigned long)_RET_IP_);
|
|
return pthread_mutex_unlock(&lock->mutex);
|
|
}
|
|
|
|
static inline int liblockdep_pthread_mutex_trylock(liblockdep_pthread_mutex_t *lock)
|
|
{
|
|
lock_acquire(&lock->dep_map, 0, 1, 0, 1, NULL, (unsigned long)_RET_IP_);
|
|
return pthread_mutex_trylock(&lock->mutex) == 0 ? 1 : 0;
|
|
}
|
|
|
|
static inline int liblockdep_pthread_mutex_destroy(liblockdep_pthread_mutex_t *lock)
|
|
{
|
|
lockdep_reset_lock(&lock->dep_map);
|
|
lockdep_unregister_key(&lock->key);
|
|
return pthread_mutex_destroy(&lock->mutex);
|
|
}
|
|
|
|
#ifdef __USE_LIBLOCKDEP
|
|
|
|
#define pthread_mutex_t liblockdep_pthread_mutex_t
|
|
#define pthread_mutex_init liblockdep_pthread_mutex_init
|
|
#define pthread_mutex_lock liblockdep_pthread_mutex_lock
|
|
#define pthread_mutex_unlock liblockdep_pthread_mutex_unlock
|
|
#define pthread_mutex_trylock liblockdep_pthread_mutex_trylock
|
|
#define pthread_mutex_destroy liblockdep_pthread_mutex_destroy
|
|
|
|
#endif
|
|
|
|
#endif
|