 @@ -93,45 +93,43 @@ zfs_match_find(zfsvfs_t *zfsvfs, znode_t
 		dnlc_update(ZTOV(dzp), name, DNLC_NO_VNODE);
 	return (error);
+}
 /*
  * Reference counting for dirlocks.  Solaris destroys the condvar as
  * soon as it broadcasts, which works for them because cv_wait doesn't
  * need to use the condvar after it is woken, but which is too fast and
  * loose with the abstraction for us in NetBSD.
  */
 static int
-zfs_dirlock_hold(zfs_dirlock_t *dl, znode_t *dzp)
+zfs_dirlock_hold(zfs_dirlock_t *dl)
+{
-	(void)dzp;		/* ignore */
+	KASSERT(mutex_owned(&dl->dl_dzp->z_lock));
 	KASSERT(mutex_owned(&dzp->z_lock));
 	if (dl->dl_refcnt >= ULONG_MAX) /* XXX Name this constant.  */
 		return (ENFILE);	/* XXX What to do?  */
 	dl->dl_refcnt++;
 	return (0);
+}
 static void
-zfs_dirlock_rele(zfs_dirlock_t *dl, znode_t *dzp)
+zfs_dirlock_rele(zfs_dirlock_t *dl)
+{
-	(void)dzp;		/* ignore */
+	KASSERT(mutex_owned(&dl->dl_dzp->z_lock));
 	KASSERT(mutex_owned(&dzp->z_lock));
 	KASSERT(dl->dl_refcnt > 0);
 	if (--dl->dl_refcnt == 0) {
 		if (dl->dl_namesize != 0)
 			kmem_free(dl->dl_name, dl->dl_namesize);
 		cv_destroy(&dl->dl_cv);
 		kmem_free(dl, sizeof(*dl));
+	}
+}
 /*
  * Lock a directory entry.  A dirlock on <dzp, name> protects that name
  * in dzp's directory zap object.  As long as you hold a dirlock, you can
 @@ -281,35 +279,35 @@ zfs_dirent_lock(zfs_dirlock_t **dlpp, zn
 			cv_init(&dl->dl_cv, NULL, CV_DEFAULT, NULL);
 			dl->dl_name = name;
 			dl->dl_sharecnt = 0;
 			dl->dl_namelock = 0;
 			dl->dl_namesize = 0;
 			dl->dl_refcnt = 1;
 			dl->dl_dzp = dzp;
 			dl->dl_next = dzp->z_dirlocks;
 			dzp->z_dirlocks = dl;
 			break;
+		}
 		if ((flag & ZSHARED) && dl->dl_sharecnt != 0)
 			break;
-		error = zfs_dirlock_hold(dl, dzp);
+		error = zfs_dirlock_hold(dl);
 		if (error) {
 			mutex_exit(&dzp->z_lock);
 			if (!(flag & ZHAVELOCK))
 				rw_exit(&dzp->z_name_lock);
 			return (error);
+		}
 		cv_wait(&dl->dl_cv, &dzp->z_lock);
-		zfs_dirlock_rele(dl, dzp);
+		zfs_dirlock_rele(dl);
+	}
 	/*
 	 * If the z_name_lock was NOT held for this dirlock record it.
 	 */
 	if (flag & ZHAVELOCK)
 		dl->dl_namelock = 1;
 	if ((flag & ZSHARED) && ++dl->dl_sharecnt > 1 && dl->dl_namesize == 0) {
 		/*
 		 * We're the second shared reference to dl.  Make a copy of
 		 * dl_name in case the first thread goes away before we do.
 		 * Note that we initialize the new name before storing its
 @@ -391,27 +389,27 @@ zfs_dirent_unlock(zfs_dirlock_t *dl)
 	if (!dl->dl_namelock)
 		rw_exit(&dzp->z_name_lock);
 	if (dl->dl_sharecnt > 1) {
 		dl->dl_sharecnt--;
 		mutex_exit(&dzp->z_lock);
 		return;
+	}
 	prev_dl = &dzp->z_dirlocks;
 	while ((cur_dl = *prev_dl) != dl)
 		prev_dl = &cur_dl->dl_next;
 	*prev_dl = dl->dl_next;
 	cv_broadcast(&dl->dl_cv);
-	zfs_dirlock_rele(dl, dzp);
+	zfs_dirlock_rele(dl);
 	mutex_exit(&dzp->z_lock);
+}
 /*
  * Look up an entry in a directory.
+ *
  * NOTE: '.' and '..' are handled as special cases because
  *	no directory entries are actually stored for them.  If this is
  *	the root of a filesystem, then '.zfs' is also treated as a
  *	special pseudo-directory.
  */
 int
 zfs_dirlook(znode_t *dzp, char *name, vnode_t **vpp, int flags,
 @@ -786,27 +784,31 @@ zfs_link_destroy(zfs_dirlock_t *dl, znod
 		if (vn_vfswlock(vp))		/* prevent new mounts on zp */
 			return (EBUSY);
 		if (vn_ismntpt(vp)) {		/* don't remove mount point */
 			vn_vfsunlock(vp);
 			return (EBUSY);
+		}
 		mutex_enter(&zp->z_lock);
 		if (zp_is_dir && !zfs_dirempty(zp)) {	/* dir not empty */
 			mutex_exit(&zp->z_lock);
 			vn_vfsunlock(vp);
 #ifdef __NetBSD__		/* XXX Make our dumb tests happier...  */
 			return (ENOTEMPTY);
 #else
 			return (EEXIST);
 #endif
+		}
 		if (zp->z_phys->zp_links <= zp_is_dir) {
 			zfs_panic_recover("zfs: link count on vnode %p is %u, "
 				"should be at least %u",
 				zp->z_vnode, (int)zp->z_phys->zp_links,
 		                zp_is_dir + 1);
 			zp->z_phys->zp_links = zp_is_dir + 1;
+		}
 		if (--zp->z_phys->zp_links == zp_is_dir) {
 			zp->z_unlinked = B_TRUE;
 			zp->z_phys->zp_links = 0;
 			unlinked = B_TRUE;
 		} else {