diff options
author | smh <smh@FreeBSD.org> | 2013-06-21 15:55:03 +0000 |
---|---|---|
committer | smh <smh@FreeBSD.org> | 2013-06-21 15:55:03 +0000 |
commit | 2687a6b31b2f707d5cac3034092c3cae2933b0e7 (patch) | |
tree | 9a0549b1f367dbeb3c50e7ebf9fc318e2ca3684a /sys/cddl/compat | |
parent | 1008a029df4d8dafcf711fbf4ce1547dece9f17e (diff) | |
download | FreeBSD-src-2687a6b31b2f707d5cac3034092c3cae2933b0e7.zip FreeBSD-src-2687a6b31b2f707d5cac3034092c3cae2933b0e7.tar.gz |
Switch ZFS mutex_owner macro to use sx_xholder as its now exported via sx.h
MFC after: 1 week
Diffstat (limited to 'sys/cddl/compat')
-rw-r--r-- | sys/cddl/compat/opensolaris/sys/mutex.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/cddl/compat/opensolaris/sys/mutex.h b/sys/cddl/compat/opensolaris/sys/mutex.h index ef05891..eff4166 100644 --- a/sys/cddl/compat/opensolaris/sys/mutex.h +++ b/sys/cddl/compat/opensolaris/sys/mutex.h @@ -71,8 +71,7 @@ typedef struct sx kmutex_t; #define mutex_tryenter(lock) sx_try_xlock(lock) #define mutex_exit(lock) sx_xunlock(lock) #define mutex_owned(lock) sx_xlocked(lock) -/* TODO: Change to sx_xholder() once it is moved from kern_sx.c to sx.h. */ -#define mutex_owner(lock) ((lock)->sx_lock & SX_LOCK_SHARED ? NULL : (struct thread *)SX_OWNER((lock)->sx_lock)) +#define mutex_owner(lock) sx_xholder(lock) #endif /* _KERNEL */ |