From: Mateusz Guzik Date: Tue, 20 Sep 2022 22:34:41 +0000 (+0200) Subject: Retire ZFS_TEARDOWN_TRY_ENTER_READ X-Git-Tag: zfs-2.2.0~758 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=c629f0bf62e351355716f9870d6c2e377584b016;hp=402426c7d81f410fa088c3bd893d4941a97d8332;p=mirror_zfs.git Retire ZFS_TEARDOWN_TRY_ENTER_READ There were never any users and it so happens the operation is not even supported by rrm locks -- the macros were wrong for Linux and FreeBSD when not using it's RMS locks. Reviewed-by: Richard Yao Reviewed-by: Brian Behlendorf Signed-off-by: Mateusz Guzik Closes #13906 --- diff --git a/include/os/freebsd/zfs/sys/zfs_vfsops_os.h b/include/os/freebsd/zfs/sys/zfs_vfsops_os.h index c44f7c6f0..f765d38db 100644 --- a/include/os/freebsd/zfs/sys/zfs_vfsops_os.h +++ b/include/os/freebsd/zfs/sys/zfs_vfsops_os.h @@ -128,9 +128,6 @@ struct zfsvfs { #define ZFS_TEARDOWN_DESTROY(zfsvfs) \ rms_destroy(&(zfsvfs)->z_teardown_lock) -#define ZFS_TEARDOWN_TRY_ENTER_READ(zfsvfs) \ - rms_try_rlock(&(zfsvfs)->z_teardown_lock) - #define ZFS_TEARDOWN_ENTER_READ(zfsvfs, tag) \ rms_rlock(&(zfsvfs)->z_teardown_lock); @@ -161,9 +158,6 @@ struct zfsvfs { #define ZFS_TEARDOWN_DESTROY(zfsvfs) \ rrm_destroy(&(zfsvfs)->z_teardown_lock) -#define ZFS_TEARDOWN_TRY_ENTER_READ(zfsvfs) \ - rw_tryenter(&(zfsvfs)->z_teardown_lock, RW_READER) - #define ZFS_TEARDOWN_ENTER_READ(zfsvfs, tag) \ rrm_enter_read(&(zfsvfs)->z_teardown_lock, tag); diff --git a/include/os/linux/zfs/sys/zfs_vfsops_os.h b/include/os/linux/zfs/sys/zfs_vfsops_os.h index 697ae2018..e320b8de4 100644 --- a/include/os/linux/zfs/sys/zfs_vfsops_os.h +++ b/include/os/linux/zfs/sys/zfs_vfsops_os.h @@ -143,9 +143,6 @@ struct zfsvfs { #define ZFS_TEARDOWN_DESTROY(zfsvfs) \ rrm_destroy(&(zfsvfs)->z_teardown_lock) -#define ZFS_TEARDOWN_TRY_ENTER_READ(zfsvfs) \ - rw_tryenter(&(zfsvfs)->z_teardown_lock, RW_READER) - #define ZFS_TEARDOWN_ENTER_READ(zfsvfs, tag) \ rrm_enter_read(&(zfsvfs)->z_teardown_lock, tag);