Date: Sun, 22 Mar 2020 17:13:19 +0000 (UTC) From: Ryan Moeller <freqlabs@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r359217 - stable/12/sys/cddl/compat/opensolaris/sys Message-ID: <202003221713.02MHDJKu037157@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: freqlabs Date: Sun Mar 22 17:13:19 2020 New Revision: 359217 URL: https://svnweb.freebsd.org/changeset/base/359217 Log: MFC r358971: TODO DONE: Use sx_xholder in SPL rwlock.h Approved by: mav (mentor) Sponsored by: iXsystems, Inc. Modified: stable/12/sys/cddl/compat/opensolaris/sys/rwlock.h Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/cddl/compat/opensolaris/sys/rwlock.h ============================================================================== --- stable/12/sys/cddl/compat/opensolaris/sys/rwlock.h Sun Mar 22 16:55:20 2020 (r359216) +++ stable/12/sys/cddl/compat/opensolaris/sys/rwlock.h Sun Mar 22 17:13:19 2020 (r359217) @@ -87,8 +87,7 @@ typedef struct sx krwlock_t; #define rw_write_held(lock) sx_xlocked(lock) #define rw_lock_held(lock) (rw_read_held(lock) || rw_write_held(lock)) #define rw_iswriter(lock) sx_xlocked(lock) -/* TODO: Change to sx_xholder() once it is moved from kern_sx.c to sx.h. */ -#define rw_owner(lock) ((lock)->sx_lock & SX_LOCK_SHARED ? NULL : (struct thread *)SX_OWNER((lock)->sx_lock)) +#define rw_owner(lock) sx_xholder(lock) #endif /* defined(_KERNEL) */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003221713.02MHDJKu037157>