summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorjeff <jeff@FreeBSD.org>2005-04-11 15:17:06 +0000
committerjeff <jeff@FreeBSD.org>2005-04-11 15:17:06 +0000
commitb391d2675bcd83d9558c90ff9d22227a862de870 (patch)
tree96bec77c80e6e093ad43db7666ed491c7fae0bbb /sys
parent0e9da1cbe73372a15cffa977fa3ac7bd538fd741 (diff)
downloadFreeBSD-src-b391d2675bcd83d9558c90ff9d22227a862de870.zip
FreeBSD-src-b391d2675bcd83d9558c90ff9d22227a862de870.tar.gz
- Enable ASSERT_VOP_ELOCKED and assert_vop_elocked() now that vnode_if.awk
uses it. Sponsored by: Isilon Systems, Inc.
Diffstat (limited to 'sys')
-rw-r--r--sys/kern/vfs_subr.c2
-rw-r--r--sys/sys/vnode.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index b5fe1a6..5fe1611 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -3243,7 +3243,6 @@ assert_vop_unlocked(struct vnode *vp, const char *str)
vfs_badlock("is locked but should not be", str, vp);
}
-#if 0
void
assert_vop_elocked(struct vnode *vp, const char *str)
{
@@ -3253,6 +3252,7 @@ assert_vop_elocked(struct vnode *vp, const char *str)
vfs_badlock("is not exclusive locked but should be", str, vp);
}
+#if 0
void
assert_vop_elocked_other(struct vnode *vp, const char *str)
{
diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h
index e711c27..e1f1c6d 100644
--- a/sys/sys/vnode.h
+++ b/sys/sys/vnode.h
@@ -478,8 +478,8 @@ extern struct vnodeop_desc *vnodeop_descs[];
*/
void assert_vi_locked(struct vnode *vp, const char *str);
void assert_vi_unlocked(struct vnode *vp, const char *str);
-#if 0
void assert_vop_elocked(struct vnode *vp, const char *str);
+#if 0
void assert_vop_elocked_other(struct vnode *vp, const char *str);
#endif
void assert_vop_locked(struct vnode *vp, const char *str);
@@ -500,8 +500,8 @@ void vop_unlock_pre(void *a);
#define ASSERT_VI_LOCKED(vp, str) assert_vi_locked((vp), (str))
#define ASSERT_VI_UNLOCKED(vp, str) assert_vi_unlocked((vp), (str))
-#if 0
#define ASSERT_VOP_ELOCKED(vp, str) assert_vop_elocked((vp), (str))
+#if 0
#define ASSERT_VOP_ELOCKED_OTHER(vp, str) assert_vop_locked_other((vp), (str))
#endif
#define ASSERT_VOP_LOCKED(vp, str) assert_vop_locked((vp), (str))
OpenPOWER on IntegriCloud