Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2008-12-12 13:40:15 -08:00
parent ba611ca42d de9d49a2b4
commit 058cbf020f
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/libspl/include/thread.h
View File

@ -45,7 +45,7 @@ thr_create(void *stack_base, size_t stack_size,
}
static inline int
mutex_held(mutex_t *mp)
_mutex_held(mutex_t *mp)
{
int rc;
@ -56,15 +56,22 @@ mutex_held(mutex_t *mp)
pthread_mutex_unlock(mp);
return rc;
}
#define MUTEX_HELD(mp) mutex_held(mp)
#define mutex_init(mp, type, arg) pthread_mutex_init(mp, NULL)
static inline void
_mutex_init(mutex_t *mp, int type, void *arg)
{
pthread_mutex_init(mp, NULL);
}
#define mutex_init(mp, type, arg) _mutex_init(mp, type, arg)
#define mutex_lock(mp) pthread_mutex_lock(mp)
#define mutex_unlock(mp) pthread_mutex_unlock(mp)
#define mutex_destroy(mp) pthread_mutex_destroy(mp)
#define mutex_trylock(mp) pthread_mutex_trylock(mp)
#define DEFAULTMUTEX PTHREAD_MUTEX_INITIALIZER
#define DEFAULTCV PTHREAD_COND_INITIALIZER
#define MUTEX_HELD(mp) _mutex_held(mp)
#define cond_init(c, type, arg) pthread_cond_init(c, NULL)
#define cond_wait(c, m) pthread_cond_wait(c, m)

2
lib/libzpool/include/sys/zfs_context.h
View File

@ -213,7 +213,7 @@ typedef mutex_t kmutex_t;
*/
#ifdef mutex_init
#undef mutex_init
#define mutex_init(mp, b, c, d) pthread_mutex_init(mp, NULL)
#define mutex_init(mp, name, type, args) _mutex_init(mp, type, args)
#endif
/*