Module Name: src Committed By: hannken Date: Tue May 26 08:39:27 UTC 2020
Modified Files: src/external/cddl/osnet/dist/uts/common/fs/zfs: zfs_vfsops.c src/external/cddl/osnet/sys/sys: vnode.h Log Message: Replace vp->v_count with vrefcnt(vp) and remove now unneeded "#define v_count ...". To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c cvs rdiff -u -r1.16 -r1.17 src/external/cddl/osnet/sys/sys/vnode.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c:1.27 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c:1.28 --- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c:1.27 Mon Apr 13 19:23:17 2020 +++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c Tue May 26 08:39:27 2020 @@ -2311,7 +2311,11 @@ zfsvfs_teardown(zfsvfs_t *zfsvfs, boolea for (zp = list_head(&zfsvfs->z_all_znodes); zp != NULL; zp = list_next(&zfsvfs->z_all_znodes, zp)) if (zp->z_sa_hdl) { +#ifdef __NetBSD__ + ASSERT(vrefcnt(ZTOV(zp)) >= 0); +#else ASSERT(ZTOV(zp)->v_count >= 0); +#endif zfs_znode_dmu_fini(zp); } mutex_exit(&zfsvfs->z_znodes_lock); Index: src/external/cddl/osnet/sys/sys/vnode.h diff -u src/external/cddl/osnet/sys/sys/vnode.h:1.16 src/external/cddl/osnet/sys/sys/vnode.h:1.17 --- src/external/cddl/osnet/sys/sys/vnode.h:1.16 Mon Apr 13 19:23:17 2020 +++ src/external/cddl/osnet/sys/sys/vnode.h Tue May 26 08:39:27 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: vnode.h,v 1.16 2020/04/13 19:23:17 ad Exp $ */ +/* $NetBSD: vnode.h,v 1.17 2020/05/26 08:39:27 hannken Exp $ */ /* * CDDL HEADER START @@ -135,7 +135,6 @@ typedef int (**vnodeops_t)(void *); #define vop_fid_args vop_vptofh_args #define a_fid a_fhp -#define v_count v_usecount #define v_object v_uobj struct vop_vptofh_args {