]> git.proxmox.com Git - mirror_zfs.git/commitdiff
FreeBSD: rework asserts in zfs_dd_lookup
authorMateusz Guzik <mjguzik@gmail.com>
Mon, 12 Oct 2020 21:27:59 +0000 (21:27 +0000)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 12 Mar 2021 23:51:07 +0000 (15:51 -0800)
1. even up ifdefs
2. drop the arguably useless teardown lock asserts -- nothing else
   checks for it

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

module/os/freebsd/zfs/zfs_dir.c

index 4b1f4a8832e044060bd271d44f5347732eff7e00..de145a677600936c349f523ac3b6d09188e2cde1 100644 (file)
@@ -206,10 +206,10 @@ zfs_dd_lookup(znode_t *dzp, znode_t **zpp)
        uint64_t parent;
        int error;
 
+#ifdef ZFS_DEBUG
        if (zfsvfs->z_replay == B_FALSE)
                ASSERT_VOP_LOCKED(ZTOV(dzp), __func__);
-       ASSERT(RRM_READ_HELD(&zfsvfs->z_teardown_lock));
-
+#endif
        if (dzp->z_unlinked)
                return (ENOENT);
 
@@ -233,7 +233,6 @@ zfs_dirlook(znode_t *dzp, const char *name, znode_t **zpp)
 #ifdef ZFS_DEBUG
        if (zfsvfs->z_replay == B_FALSE)
                ASSERT_VOP_LOCKED(ZTOV(dzp), __func__);
-       ASSERT(RRM_READ_HELD(&zfsvfs->z_teardown_lock));
 #endif
        if (dzp->z_unlinked)
                return (SET_ERROR(ENOENT));