svn commit: r252061 - head/sys/cddl/compat/opensolaris/sys

Steven Hartland smh at FreeBSD.org
Fri Jun 21 15:55:03 UTC 2013


Author: smh
Date: Fri Jun 21 15:55:03 2013
New Revision: 252061
URL: http://svnweb.freebsd.org/changeset/base/252061

Log:
  Switch ZFS mutex_owner macro to use sx_xholder as its now exported via sx.h
  
  MFC after:	1 week

Modified:
  head/sys/cddl/compat/opensolaris/sys/mutex.h

Modified: head/sys/cddl/compat/opensolaris/sys/mutex.h
==============================================================================
--- head/sys/cddl/compat/opensolaris/sys/mutex.h	Fri Jun 21 15:47:10 2013	(r252060)
+++ head/sys/cddl/compat/opensolaris/sys/mutex.h	Fri Jun 21 15:55:03 2013	(r252061)
@@ -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 */
 


More information about the svn-src-all mailing list