From owner-svn-src-head@FreeBSD.ORG  Fri Jun 21 15:55:03 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id B0A9C41A;
 Fri, 21 Jun 2013 15:55:03 +0000 (UTC) (envelope-from smh@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id A401217B2;
 Fri, 21 Jun 2013 15:55:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5LFt3IZ037599;
 Fri, 21 Jun 2013 15:55:03 GMT (envelope-from smh@svn.freebsd.org)
Received: (from smh@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5LFt3K7037598;
 Fri, 21 Jun 2013 15:55:03 GMT (envelope-from smh@svn.freebsd.org)
Message-Id: <201306211555.r5LFt3K7037598@svn.freebsd.org>
From: Steven Hartland <smh@FreeBSD.org>
Date: Fri, 21 Jun 2013 15:55:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r252061 - head/sys/cddl/compat/opensolaris/sys
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Jun 2013 15:55:03 -0000

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 */