Module Name: src
Committed By: rmind
Date: Sun Jun 12 14:47:20 UTC 2011
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: zfs_znode.c
Log Message:
Fix ZFS build.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
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.10 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c:1.11
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c:1.10 Thu Mar 10 19:32:39 2011
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c Sun Jun 12 14:47:20 2011
@@ -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, "
