Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

FreeBSD: remove 2 assertions that teardown lock is not held 

They are not very useful and hard to implement in the rms routine
the code is about to start using.

Reviewed-by: Ryan Moeller <ryan@iXsystems.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Matt Macy <mmacy@FreeBSD.org>
Signed-off-by: Mateusz Guzik <mjguzik@gmail.com>
Closes #11153
This commit is contained in:
Mateusz Guzik 2020-11-12 17:33:14 -05:00 committed by Tony Hutter
parent 8773e29c23
commit 140584bfff
1 changed files with 0 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
module/os/freebsd/zfs/zfs_vnops_os.c
View File

@ -933,10 +933,6 @@ zfs_lookup_lock(vnode_t *dvp, vnode_t *vp, const char *name, int lkflags)
if (zfsvfs->z_replay == B_FALSE) if (zfsvfs->z_replay == B_FALSE)
ASSERT_VOP_LOCKED(dvp, __func__); ASSERT_VOP_LOCKED(dvp, __func__);
#ifdef DIAGNOSTIC
if ((zdp->z_pflags & ZFS_XATTR) == 0)
VERIFY(!RRM_LOCK_HELD(&zfsvfs->z_teardown_lock));
#endif
if (name[0] == 0 || (name[0] == '.' && name[1] == 0)) { if (name[0] == 0 || (name[0] == '.' && name[1] == 0)) {
ASSERT3P(dvp, ==, vp); ASSERT3P(dvp, ==, vp);
@ -5957,39 +5953,6 @@ zfs_vptocnp(struct vop_vptocnp_args *ap)
return (error); return (error);
} }
#ifdef DIAGNOSTIC
#ifndef _SYS_SYSPROTO_H_
struct vop_lock1_args {
struct vnode *a_vp;
int a_flags;
char *file;
int line;
};
#endif
static int
zfs_lock(struct vop_lock1_args *ap)
{
vnode_t *vp;
znode_t *zp;
int err;
#if __FreeBSD_version >= 1300064
err = vop_lock(ap);
#else
err = vop_stdlock(ap);
#endif
if (err == 0 && (ap->a_flags & LK_NOWAIT) == 0) {
vp = ap->a_vp;
zp = vp->v_data;
if (vp->v_mount != NULL && !VN_IS_DOOMED(vp) &&
zp != NULL && (zp->z_pflags & ZFS_XATTR) == 0)
VERIFY(!RRM_LOCK_HELD(&zp->z_zfsvfs->z_teardown_lock));
}
return (err);
}
#endif
struct vop_vector zfs_vnodeops; struct vop_vector zfs_vnodeops;
struct vop_vector zfs_fifoops; struct vop_vector zfs_fifoops;
struct vop_vector zfs_shareops; struct vop_vector zfs_shareops;
@ -6040,17 +6003,9 @@ struct vop_vector zfs_vnodeops = {
.vop_putpages = zfs_freebsd_putpages, .vop_putpages = zfs_freebsd_putpages,
.vop_vptocnp = zfs_vptocnp, .vop_vptocnp = zfs_vptocnp,
#if __FreeBSD_version >= 1300064 #if __FreeBSD_version >= 1300064
#ifdef DIAGNOSTIC
.vop_lock1 = zfs_lock,
#else
.vop_lock1 = vop_lock, .vop_lock1 = vop_lock,
#endif
.vop_unlock = vop_unlock, .vop_unlock = vop_unlock,
.vop_islocked = vop_islocked, .vop_islocked = vop_islocked,
#else
#ifdef DIAGNOSTIC
.vop_lock1 = zfs_lock,
#endif
#endif #endif
}; };
VFS_VOP_VECTOR_REGISTER(zfs_vnodeops); VFS_VOP_VECTOR_REGISTER(zfs_vnodeops);