c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-01-27 18:34:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add mutex_enter_nested() as wrapper for mutex_lock_nested().

Browse Source 
This symbol can be used by GPL modules which use the SPL to handle
cases where a call path takes a two different locks by the same
name.  This is needed to avoid a false positive in the lock checker.
This commit is contained in:
Brian Behlendorf 2009-11-15 14:27:15 -08:00
parent 8b45dda2bc
commit 05b48408fb
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
include/sys/mutex.h
View File

@ -52,17 +52,26 @@ mutex_owner(kmutex_t *mp)
#define MUTEX_HELD(mp) mutex_owned(mp) #define MUTEX_HELD(mp) mutex_owned(mp)
#undef mutex_init #undef mutex_init
#define mutex_init(mp, name, type, ibc) \ #define mutex_init(mp, name, type, ibc) \
({ \ ({ \
static struct lock_class_key __key; \ static struct lock_class_key __key; \
ASSERT(type == MUTEX_DEFAULT); \ ASSERT(type == MUTEX_DEFAULT); \
\ \
__mutex_init((mp), #mp, &__key); \ __mutex_init((mp), #mp, &__key); \
}) })
/* #define mutex_destroy(mp) ((void)0) */
#define mutex_tryenter(mp) mutex_trylock(mp) #define mutex_tryenter(mp) mutex_trylock(mp)
#define mutex_enter(mp) mutex_lock(mp) #define mutex_enter(mp) mutex_lock(mp)
#define mutex_exit(mp) mutex_unlock(mp) #define mutex_exit(mp) mutex_unlock(mp)
#ifdef HAVE_GPL_ONLY_SYMBOLS
# define mutex_enter_nested(mp, sc) mutex_lock_nested(mp, sc)
#else
# define mutex_enter_nested(mp, sc) mutex_enter(mp)
# ifdef CONFIG_DEBUG_MUTEXES
# define mutex_destroy(mp) ((void)0)
# endif /* CONFIG_DEBUG_MUTEXES */
#endif /* HAVE_GPL_ONLY_SYMBOLS */
#else /* HAVE_MUTEX_OWNER */ #else /* HAVE_MUTEX_OWNER */
typedef struct { typedef struct {
@ -193,6 +202,19 @@ mutex_owner(kmutex_t *mp)
mutex_unlock(MUTEX(mp)); \ mutex_unlock(MUTEX(mp)); \
}) })
#ifdef HAVE_GPL_ONLY_SYMBOLS
# define mutex_enter_nested(mp, sc) \
({ \
mutex_lock_nested(MUTEX(mp, sc)); \
spl_mutex_set_owner(mp); \
})
#else
# define mutex_enter_nested(mp, sc) \
({ \
mutex_enter(mp); \
})
#endif
#endif /* HAVE_MUTEX_OWNER */ #endif /* HAVE_MUTEX_OWNER */
int spl_mutex_init(void); int spl_mutex_init(void);