diff options
| author | avg <avg@FreeBSD.org> | 2016-12-14 16:08:35 +0000 |
|---|---|---|
| committer | avg <avg@FreeBSD.org> | 2016-12-14 16:08:35 +0000 |
| commit | 6872d82f708dc9afa568571cbc2ac7ba0b4564c2 (patch) | |
| tree | e966a1601564f27fab95801e7ada0e543028f480 /sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c | |
| parent | c4ce610aeaa6d50d093ec18897c3ab63b5f9e536 (diff) | |
| download | FreeBSD-src-6872d82f708dc9afa568571cbc2ac7ba0b4564c2.zip FreeBSD-src-6872d82f708dc9afa568571cbc2ac7ba0b4564c2.tar.gz | |
MFC r308887,309090: fix unsafe modification of zfs_vnodeops when
DIAGNOSTIC is enabled
Diffstat (limited to 'sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c index 224e829..1ad0d83 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c @@ -727,14 +727,7 @@ zfs_znode_alloc(zfsvfs_t *zfsvfs, dmu_buf_t *db, int blksz, /* * 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); |
