Module Name: src
Committed By: christos
Date: Mon Oct 21 15:31:26 UTC 2013
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: zfs_znode.c
Log Message:
NetBSD does not have vn_in_dnlc
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c
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_znode.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c:1.14 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c:1.15
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c:1.14 Mon Sep 23 15:42:42 2013
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c Mon Oct 21 11:31:26 2013
@@ -497,7 +497,9 @@ zfs_create_share_dir(zfsvfs_t *zfsvfs, d
zfs_mknode(sharezp, &vattr, tx, kcred, IS_ROOT_NODE,
&zp, 0, &acl_ids);
ASSERT3P(zp, ==, sharezp);
+#ifndef __NetBSD__
ASSERT(!vn_in_dnlc(ZTOV(sharezp))); /* not valid to move */
+#endif
POINTER_INVALIDATE(&sharezp->z_zfsvfs);
error = zap_add(zfsvfs->z_os, MASTER_NODE_OBJ,
ZFS_SHARES_DIR, 8, 1, &sharezp->z_id, tx);