diff options
| author | Mateusz Guzik <[email protected]> | 2020-10-12 21:27:59 +0000 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2021-03-12 15:51:07 -0800 |
| commit | 300f68e017e80366f406a816e6070521d1215e82 (patch) | |
| tree | 09bb43bd10dbfb276f74b891565e3d559fcef14c | |
| parent | 446400346d2dcec222abebf0db1b0ad61f013548 (diff) | |
FreeBSD: rework asserts in zfs_dd_lookup
1. even up ifdefs
2. drop the arguably useless teardown lock asserts -- nothing else
checks for it
Reviewed-by: Ryan Moeller <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Matt Macy <[email protected]>
Signed-off-by: Mateusz Guzik <[email protected]>
Closes #11153
| -rw-r--r-- | module/os/freebsd/zfs/zfs_dir.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/module/os/freebsd/zfs/zfs_dir.c b/module/os/freebsd/zfs/zfs_dir.c index 4b1f4a883..de145a677 100644 --- a/module/os/freebsd/zfs/zfs_dir.c +++ b/module/os/freebsd/zfs/zfs_dir.c @@ -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)); |