d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

further fix zfs_lock() diagnostics

Browse Source 
It was very wrong to look at the vnode and znode internals without
having locked the vnode first.

Reported by:	pho
Tested by:	pho
MFC after:	1 week
X-MFC with:	r308887
This commit is contained in:
Andriy Gapon 2016-11-24 09:00:51 +00:00
parent 25641fc705
commit d15b9428bb
1 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
View File

@ -5963,10 +5963,6 @@ zfs_vptocnp(struct vop_vptocnp_args *ap)
}
#ifdef DIAGNOSTIC
#define CHECK_LOR ((flags & LK_NOWAIT) == 0 && vp->v_mount != NULL && \
(vp->v_iflag & VI_DOOMED) == 0 && vp->v_data != NULL && \
(zp->z_pflags & ZFS_XATTR) == 0)
static int
zfs_lock(ap)
struct vop_lock1_args /* {
@ -5976,28 +5972,20 @@ 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;
zp = vp->v_data;
flags = ap->a_flags;
if ((flags & LK_INTERLOCK) == 0 && CHECK_LOR) {
zfsvfs = zp->z_zfsvfs;
VERIFY(!RRM_LOCK_HELD(&zfsvfs->z_teardown_lock));
}
err = vop_stdlock(ap);
if ((flags & LK_INTERLOCK) != 0 && CHECK_LOR) {
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);
}
#undef CHECK_LOR
#endif
struct vop_vector zfs_vnodeops;