i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

freebsd network compat layer: fix for hrev45146

Browse Source 
* MTX_DEF is the default type: it shouldn't be tested against but used
  as the default type.
This commit is contained in:
Jerome Duval
2013-01-10 23:54:19 +01:00
parent 4f5a4183de
commit bf4355a48e
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/compat/freebsd_network/mutex.c
+8 -9
View File
@@ -21,14 +21,13 @@ void
mtx_init(struct mtx *mutex, const char *name, const char *type, mtx_init(struct mtx *mutex, const char *name, const char *type,
int options) int options)
{ {
if (options & MTX_DEF) { if (options & MTX_RECURSE) {
mutex_init_etc(&mutex->u.mutex.lock, name, MUTEX_FLAG_CLONE_NAME);
mutex->u.mutex.owner = -1;
} else if (options & MTX_RECURSE) {
recursive_lock_init_etc(&mutex->u.recursive, name, recursive_lock_init_etc(&mutex->u.recursive, name,
MUTEX_FLAG_CLONE_NAME); MUTEX_FLAG_CLONE_NAME);
} else } else {
panic("fbsd: unsupported mutex type"); mutex_init_etc(&mutex->u.mutex.lock, name, MUTEX_FLAG_CLONE_NAME);
mutex->u.mutex.owner = -1;
}
mutex->type = options; mutex->type = options;
} }
@@ -37,10 +36,10 @@ mtx_init(struct mtx *mutex, const char *name, const char *type,
void void
mtx_destroy(struct mtx *mutex) mtx_destroy(struct mtx *mutex)
{ {
if (mutex->type & MTX_DEF) if (mutex->type & MTX_RECURSE)
mutex_destroy(&mutex->u.mutex.lock);
else if (mutex->type & MTX_RECURSE)
recursive_lock_destroy(&mutex->u.recursive); recursive_lock_destroy(&mutex->u.recursive);
else
mutex_destroy(&mutex->u.mutex.lock);
} }