[src/trunk]: src/external/cddl/osnet/dist/uts/common/fs/zfs Fix ZFS build.

[rmind <rmind%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/de1303be2da3
branches:  trunk
changeset: 765992:de1303be2da3
user:      rmind <rmind%NetBSD.org@localhost>
date:      Sun Jun 12 14:47:20 2011 +0000

description:
Fix ZFS build.

diffstat:

 external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c |  10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diffs (34 lines):

diff -r 0bdf76d6c80a -r de1303be2da3 external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c
--- a/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c    Sun Jun 12 14:31:31 2011 +0000
+++ b/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c    Sun Jun 12 14:47:20 2011 +0000
@@ -485,7 +485,11 @@
 
        vp = ZTOV(sharezp);
        error = getnewvnode(VT_ZFS, zfsvfs->z_parent->z_vfs,
-           zfs_vnodeop_p, &sharezp->z_vnode);
+           zfs_vnodeop_p, NULL, &sharezp->z_vnode);
+       if (error) {
+               kmem_cache_free(znode_cache, sharezp);
+               return error;
+       }
        vp->v_type = VDIR;
 
        VERIFY(0 == zfs_acl_ids_create(sharezp, IS_ROOT_NODE, &vattr,
@@ -617,7 +621,7 @@
        for (;;) {
 
                error = getnewvnode(VT_ZFS, zfsvfs->z_parent->z_vfs,
-                   zfs_vnodeop_p, &zp->z_vnode);
+                   zfs_vnodeop_p, NULL, &zp->z_vnode);
                if (__predict_true(error == 0))
                        break;
                printf("WARNING: zfs_znode_alloc: unable to get vnode, "
@@ -1556,7 +1560,7 @@
 
        for (;;) {
                error = getnewvnode(VT_ZFS, NULL, zfs_vnodeop_p,
-                   &rootzp->z_vnode);
+                   NULL, &rootzp->z_vnode);
                if (error == 0)
                        break;
                printf("WARNING: zfs_create_fs: unable to get vnode, "