Author: avg
Date: Tue Sep 12 06:02:21 2017
New Revision: 323479
URL: https://svnweb.freebsd.org/changeset/base/323479
Log:
zfs: tighten debug versions of ZTOV and VTOZ
MFC after: 2 weeks
Sponsored by: Panzura
Modified:
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h Tue Sep
12 04:21:04 2017 (r323478)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h Tue Sep
12 06:02:21 2017 (r323479)
@@ -227,7 +227,7 @@ ZTOV(znode_t *zp)
{
vnode_t *vp = zp->z_vnode;
- ASSERT(vp == NULL || vp->v_data == NULL || vp->v_data == zp);
+ ASSERT(vp != NULL && vp->v_data == zp);
return (vp);
}
static __inline znode_t *
@@ -235,7 +235,7 @@ VTOZ(vnode_t *vp)
{
znode_t *zp = (znode_t *)vp->v_data;
- ASSERT(zp == NULL || zp->z_vnode == NULL || zp->z_vnode == vp);
+ ASSERT(zp != NULL && zp->z_vnode == vp);
return (zp);
}
#else
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c Tue Sep
12 04:21:04 2017 (r323478)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c Tue Sep
12 06:02:21 2017 (r323479)
@@ -143,8 +143,7 @@ zfs_znode_cache_destructor(void *buf, void *arg)
znode_t *zp = buf;
ASSERT(!POINTER_IS_VALID(zp->z_zfsvfs));
- ASSERT(ZTOV(zp) == NULL);
- vn_free(ZTOV(zp));
+ ASSERT3P(zp->z_vnode, ==, NULL);
ASSERT(!list_link_active(&zp->z_link_node));
mutex_destroy(&zp->z_acl_lock);
avl_destroy(&zp->z_range_avl);
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
