diff options
| author | Mateusz Guzik <[email protected]> | 2020-11-04 17:19:35 -0500 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2021-03-12 15:51:31 -0800 |
| commit | 9847f77f012b0ea4d54a7151c726e63122e2117d (patch) | |
| tree | 6d86dcd9bddd65d4713d0a9cc5075c4eaf7df6f6 /include/os/freebsd/zfs/sys/zfs_vfsops_os.h | |
| parent | f9acd578f0d62639c4e0b4b44bd4a72fa1cd311a (diff) | |
FreeBSD: rename teardown inactive macros to mimick rrm convention
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
Diffstat (limited to 'include/os/freebsd/zfs/sys/zfs_vfsops_os.h')
| -rw-r--r-- | include/os/freebsd/zfs/sys/zfs_vfsops_os.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/include/os/freebsd/zfs/sys/zfs_vfsops_os.h b/include/os/freebsd/zfs/sys/zfs_vfsops_os.h index c7f464d03..458e089c5 100644 --- a/include/os/freebsd/zfs/sys/zfs_vfsops_os.h +++ b/include/os/freebsd/zfs/sys/zfs_vfsops_os.h @@ -113,52 +113,52 @@ struct zfsvfs { }; #ifdef TEARDOWN_INACTIVE_RMS -#define ZFS_INIT_TEARDOWN_INACTIVE(zfsvfs) \ +#define ZFS_TEARDOWN_INACTIVE_INIT(zfsvfs) \ rms_init(&(zfsvfs)->z_teardown_inactive_lock, "zfs teardown inactive") -#define ZFS_DESTROY_TEARDOWN_INACTIVE(zfsvfs) \ +#define ZFS_TEARDOWN_INACTIVE_DESTROY(zfsvfs) \ rms_destroy(&(zfsvfs)->z_teardown_inactive_lock) -#define ZFS_TRYRLOCK_TEARDOWN_INACTIVE(zfsvfs) \ +#define ZFS_TEARDOWN_INACTIVE_TRY_ENTER_READ(zfsvfs) \ rms_try_rlock(&(zfsvfs)->z_teardown_inactive_lock) -#define ZFS_RLOCK_TEARDOWN_INACTIVE(zfsvfs) \ +#define ZFS_TEARDOWN_INACTIVE_ENTER_READ(zfsvfs) \ rms_rlock(&(zfsvfs)->z_teardown_inactive_lock) -#define ZFS_RUNLOCK_TEARDOWN_INACTIVE(zfsvfs) \ +#define ZFS_TEARDOWN_INACTIVE_EXIT_READ(zfsvfs) \ rms_runlock(&(zfsvfs)->z_teardown_inactive_lock) -#define ZFS_WLOCK_TEARDOWN_INACTIVE(zfsvfs) \ +#define ZFS_TEARDOWN_INACTIVE_ENTER_WRITE(zfsvfs) \ rms_wlock(&(zfsvfs)->z_teardown_inactive_lock) -#define ZFS_WUNLOCK_TEARDOWN_INACTIVE(zfsvfs) \ +#define ZFS_TEARDOWN_INACTIVE_EXIT_WRITE(zfsvfs) \ rms_wunlock(&(zfsvfs)->z_teardown_inactive_lock) -#define ZFS_TEARDOWN_INACTIVE_WLOCKED(zfsvfs) \ +#define ZFS_TEARDOWN_INACTIVE_WRITE_HELD(zfsvfs) \ rms_wowned(&(zfsvfs)->z_teardown_inactive_lock) #else -#define ZFS_INIT_TEARDOWN_INACTIVE(zfsvfs) \ +#define ZFS_TEARDOWN_INACTIVE_INIT(zfsvfs) \ rw_init(&(zfsvfs)->z_teardown_inactive_lock, NULL, RW_DEFAULT, NULL) -#define ZFS_DESTROY_TEARDOWN_INACTIVE(zfsvfs) \ +#define ZFS_TEARDOWN_INACTIVE_DESTROY(zfsvfs) \ rw_destroy(&(zfsvfs)->z_teardown_inactive_lock) -#define ZFS_TRYRLOCK_TEARDOWN_INACTIVE(zfsvfs) \ +#define ZFS_TEARDOWN_INACTIVE_TRY_ENTER_READ(zfsvfs) \ rw_tryenter(&(zfsvfs)->z_teardown_inactive_lock, RW_READER) -#define ZFS_RLOCK_TEARDOWN_INACTIVE(zfsvfs) \ +#define ZFS_TEARDOWN_INACTIVE_ENTER_READ(zfsvfs) \ rw_enter(&(zfsvfs)->z_teardown_inactive_lock, RW_READER) -#define ZFS_RUNLOCK_TEARDOWN_INACTIVE(zfsvfs) \ +#define ZFS_TEARDOWN_INACTIVE_EXIT_READ(zfsvfs) \ rw_exit(&(zfsvfs)->z_teardown_inactive_lock) -#define ZFS_WLOCK_TEARDOWN_INACTIVE(zfsvfs) \ +#define ZFS_TEARDOWN_INACTIVE_ENTER_WRITE(zfsvfs) \ rw_enter(&(zfsvfs)->z_teardown_inactive_lock, RW_WRITER) -#define ZFS_WUNLOCK_TEARDOWN_INACTIVE(zfsvfs) \ +#define ZFS_TEARDOWN_INACTIVE_EXIT_WRITE(zfsvfs) \ rw_exit(&(zfsvfs)->z_teardown_inactive_lock) -#define ZFS_TEARDOWN_INACTIVE_WLOCKED(zfsvfs) \ +#define ZFS_TEARDOWN_INACTIVE_WRITE_HELD(zfsvfs) \ RW_WRITE_HELD(&(zfsvfs)->z_teardown_inactive_lock) #endif |