aboutsummaryrefslogtreecommitdiff
path: root/sys/sys/lock.h
diff options
context:
space:
mode:
authorJohn Baldwin <jhb@FreeBSD.org>2007-03-21 21:20:51 +0000
committerJohn Baldwin <jhb@FreeBSD.org>2007-03-21 21:20:51 +0000
commitaa89d8cd5299e308fe8eaa099fe89bfeb40917d1 (patch)
tree3b7e93e92bb0a2a4559d2d242f9c069564849c03 /sys/sys/lock.h
parent503916a7c1d38ccdfbc10aa3e2e68f95b03727c8 (diff)
downloadsrc-aa89d8cd5299e308fe8eaa099fe89bfeb40917d1.tar.gz
src-aa89d8cd5299e308fe8eaa099fe89bfeb40917d1.zip
Rename the 'mtx_object', 'rw_object', and 'sx_object' members of mutexes,
rwlocks, and sx locks to 'lock_object'.
Notes
Notes: svn path=/head/; revision=167787
Diffstat (limited to 'sys/sys/lock.h')
-rw-r--r--sys/sys/lock.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/sys/lock.h b/sys/sys/lock.h
index 3a3b4d28a3b8..d46ac0d4a894 100644
--- a/sys/sys/lock.h
+++ b/sys/sys/lock.h
@@ -326,14 +326,14 @@ const char *witness_file(struct lock_object *);
* wherever they please without having to actually grab a lock to do so.
*/
#define witness_check_mutex(m) \
- WITNESS_CHECKORDER(&(m)->mtx_object, LOP_EXCLUSIVE, LOCK_FILE, \
+ WITNESS_CHECKORDER(&(m)->lock_object, LOP_EXCLUSIVE, LOCK_FILE, \
LOCK_LINE)
#define witness_check_shared_sx(sx) \
- WITNESS_CHECKORDER(&(sx)->sx_object, 0, LOCK_FILE, LOCK_LINE)
+ WITNESS_CHECKORDER(&(sx)->lock_object, 0, LOCK_FILE, LOCK_LINE)
#define witness_check_exclusive_sx(sx) \
- WITNESS_CHECKORDER(&(sx)->sx_object, LOP_EXCLUSIVE, LOCK_FILE, \
+ WITNESS_CHECKORDER(&(sx)->lock_object, LOP_EXCLUSIVE, LOCK_FILE, \
LOCK_LINE)
#endif /* _KERNEL */