Author: avg
Date: Wed Dec 14 16:08:35 2016
New Revision: 310067
URL: https://svnweb.freebsd.org/changeset/base/310067
Log:
MFC r308887,309090: fix unsafe modification of zfs_vnodeops when
DIAGNOSTIC is enabled
Modified:
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.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_vnops.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
Wed Dec 14 16:08:28 2016 (r310066)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
Wed Dec 14 16:08:35 2016 (r310067)
@@ -6020,26 +6020,17 @@ zfs_lock(ap)
int line;
} */ *ap;
{
- zfsvfs_t *zfsvfs;
- znode_t *zp;
vnode_t *vp;
- int flags;
+ znode_t *zp;
int err;
- vp = ap->a_vp;
- flags = ap->a_flags;
- if ((flags & LK_INTERLOCK) == 0 && (flags & LK_NOWAIT) == 0 &&
- (vp->v_iflag & VI_DOOMED) == 0 && (zp = vp->v_data) != NULL &&
- (zp->z_pflags & ZFS_XATTR) == 0) {
- zfsvfs = zp->z_zfsvfs;
- VERIFY(!RRM_LOCK_HELD(&zfsvfs->z_teardown_lock));
- }
err = vop_stdlock(ap);
- if ((flags & LK_INTERLOCK) != 0 && (flags & LK_NOWAIT) == 0 &&
- (vp->v_iflag & VI_DOOMED) == 0 && (zp = vp->v_data) != NULL &&
- (zp->z_pflags & ZFS_XATTR) == 0) {
- zfsvfs = zp->z_zfsvfs;
- VERIFY(!RRM_LOCK_HELD(&zfsvfs->z_teardown_lock));
+ if (err == 0 && (ap->a_flags & LK_NOWAIT) == 0) {
+ vp = ap->a_vp;
+ zp = vp->v_data;
+ if (vp->v_mount != NULL && (vp->v_iflag & VI_DOOMED) == 0 &&
+ zp != NULL && (zp->z_pflags & ZFS_XATTR) == 0)
+ VERIFY(!RRM_LOCK_HELD(&zp->z_zfsvfs->z_teardown_lock));
}
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
Wed Dec 14 16:08:28 2016 (r310066)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
Wed Dec 14 16:08:35 2016 (r310067)
@@ -727,14 +727,7 @@ zfs_znode_alloc(zfsvfs_t *zfsvfs, dmu_bu
/*
* Acquire vnode lock before making it available to the world.
*/
-#ifdef DIAGNOSTIC
- vop_lock1_t *orig_lock = vp->v_op->vop_lock1;
- vp->v_op->vop_lock1 = vop_stdlock;
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
- vp->v_op->vop_lock1 = orig_lock;
-#else
- vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
-#endif
VN_LOCK_AREC(vp);
if (vp->v_type != VFIFO)
VN_LOCK_ASHARE(vp);
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
