Author: kib
Date: Mon Aug 4 01:12:49 2014
New Revision: 269494
URL: http://svnweb.freebsd.org/changeset/base/269494
Log:
MFC r269189:
Initialize zfs vnode v_hash when the vnode is allocated.
Modified:
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
Mon Aug 4 01:10:47 2014 (r269493)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
Mon Aug 4 01:12:49 2014 (r269494)
@@ -2076,8 +2076,6 @@ zfs_vget(vfs_t *vfsp, ino_t ino, int fla
err = vn_lock(*vpp, flags);
if (err != 0)
*vpp = NULL;
- else
- (*vpp)->v_hash = ino;
return (err);
}
Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
Mon Aug 4 01:10:47 2014 (r269493)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
Mon Aug 4 01:12:49 2014 (r269494)
@@ -1228,9 +1228,10 @@ again:
vnode_t *vp = ZTOV(zp);
err = insmntque(vp, zfsvfs->z_vfs);
- if (err == 0)
+ if (err == 0) {
+ vp->v_hash = obj_num;
VOP_UNLOCK(vp, 0);
- else {
+ } else {
zp->z_vnode = NULL;
zfs_znode_dmu_fini(zp);
zfs_znode_free(zp);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
