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

FreeBSD: rename teardown inactive macros to mimick rrm convention 

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-04 17:19:35 -05:00 committed by Tony Hutter
parent 140584bfff
commit cd80d6d355
4 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
include/os/freebsd/zfs/sys/zfs_vfsops_os.h
View File

@ -113,52 +113,52 @@ struct zfsvfs {
}; };
#ifdef TEARDOWN_INACTIVE_RMS #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") 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) 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) 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) 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) 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) 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) 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) rms_wowned(&(zfsvfs)->z_teardown_inactive_lock)
#else #else
#define ZFS_INIT_TEARDOWN_INACTIVE(zfsvfs) \ #define ZFS_TEARDOWN_INACTIVE_INIT(zfsvfs) \
rw_init(&(zfsvfs)->z_teardown_inactive_lock, NULL, RW_DEFAULT, NULL) 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) 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) 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) 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) 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) 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) 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) RW_WRITE_HELD(&(zfsvfs)->z_teardown_inactive_lock)
#endif #endif

18
module/os/freebsd/zfs/zfs_vfsops.c
View File

@ -990,7 +990,7 @@ zfsvfs_create_impl(zfsvfs_t **zfvp, zfsvfs_t *zfsvfs, objset_t *os)
#else #else
rrm_init(&zfsvfs->z_teardown_lock, B_FALSE); rrm_init(&zfsvfs->z_teardown_lock, B_FALSE);
#endif #endif
ZFS_INIT_TEARDOWN_INACTIVE(zfsvfs); ZFS_TEARDOWN_INACTIVE_INIT(zfsvfs);
rw_init(&zfsvfs->z_fuid_lock, NULL, RW_DEFAULT, NULL); rw_init(&zfsvfs->z_fuid_lock, NULL, RW_DEFAULT, NULL);
for (int i = 0; i != ZFS_OBJ_MTX_SZ; i++) for (int i = 0; i != ZFS_OBJ_MTX_SZ; i++)
mutex_init(&zfsvfs->z_hold_mtx[i], NULL, MUTEX_DEFAULT, NULL); mutex_init(&zfsvfs->z_hold_mtx[i], NULL, MUTEX_DEFAULT, NULL);
@ -1130,7 +1130,7 @@ zfsvfs_free(zfsvfs_t *zfsvfs)
ASSERT(zfsvfs->z_nr_znodes == 0); ASSERT(zfsvfs->z_nr_znodes == 0);
list_destroy(&zfsvfs->z_all_znodes); list_destroy(&zfsvfs->z_all_znodes);
rrm_destroy(&zfsvfs->z_teardown_lock); rrm_destroy(&zfsvfs->z_teardown_lock);
ZFS_DESTROY_TEARDOWN_INACTIVE(zfsvfs); ZFS_TEARDOWN_INACTIVE_DESTROY(zfsvfs);
rw_destroy(&zfsvfs->z_fuid_lock); rw_destroy(&zfsvfs->z_fuid_lock);
for (i = 0; i != ZFS_OBJ_MTX_SZ; i++) for (i = 0; i != ZFS_OBJ_MTX_SZ; i++)
mutex_destroy(&zfsvfs->z_hold_mtx[i]); mutex_destroy(&zfsvfs->z_hold_mtx[i]);
@ -1557,7 +1557,7 @@ zfsvfs_teardown(zfsvfs_t *zfsvfs, boolean_t unmounting)
zfsvfs->z_log = NULL; zfsvfs->z_log = NULL;
} }
ZFS_WLOCK_TEARDOWN_INACTIVE(zfsvfs); ZFS_TEARDOWN_INACTIVE_ENTER_WRITE(zfsvfs);
/* /*
* If we are not unmounting (ie: online recv) and someone already * If we are not unmounting (ie: online recv) and someone already
@ -1565,7 +1565,7 @@ zfsvfs_teardown(zfsvfs_t *zfsvfs, boolean_t unmounting)
* or a reopen of z_os failed then just bail out now. * or a reopen of z_os failed then just bail out now.
*/ */
if (!unmounting && (zfsvfs->z_unmounted || zfsvfs->z_os == NULL)) { if (!unmounting && (zfsvfs->z_unmounted || zfsvfs->z_os == NULL)) {
ZFS_WUNLOCK_TEARDOWN_INACTIVE(zfsvfs); ZFS_TEARDOWN_INACTIVE_EXIT_WRITE(zfsvfs);
rrm_exit(&zfsvfs->z_teardown_lock, FTAG); rrm_exit(&zfsvfs->z_teardown_lock, FTAG);
return (SET_ERROR(EIO)); return (SET_ERROR(EIO));
} }
@ -1593,7 +1593,7 @@ zfsvfs_teardown(zfsvfs_t *zfsvfs, boolean_t unmounting)
*/ */
if (unmounting) { if (unmounting) {
zfsvfs->z_unmounted = B_TRUE; zfsvfs->z_unmounted = B_TRUE;
ZFS_WUNLOCK_TEARDOWN_INACTIVE(zfsvfs); ZFS_TEARDOWN_INACTIVE_EXIT_WRITE(zfsvfs);
rrm_exit(&zfsvfs->z_teardown_lock, FTAG); rrm_exit(&zfsvfs->z_teardown_lock, FTAG);
} }
@ -1913,7 +1913,7 @@ zfs_resume_fs(zfsvfs_t *zfsvfs, dsl_dataset_t *ds)
znode_t *zp; znode_t *zp;
ASSERT(RRM_WRITE_HELD(&zfsvfs->z_teardown_lock)); ASSERT(RRM_WRITE_HELD(&zfsvfs->z_teardown_lock));
ASSERT(ZFS_TEARDOWN_INACTIVE_WLOCKED(zfsvfs)); ASSERT(ZFS_TEARDOWN_INACTIVE_WRITE_HELD(zfsvfs));
/* /*
* We already own this, so just update the objset_t, as the one we * We already own this, so just update the objset_t, as the one we
@ -1951,7 +1951,7 @@ zfs_resume_fs(zfsvfs_t *zfsvfs, dsl_dataset_t *ds)
bail: bail:
/* release the VOPs */ /* release the VOPs */
ZFS_WUNLOCK_TEARDOWN_INACTIVE(zfsvfs); ZFS_TEARDOWN_INACTIVE_EXIT_WRITE(zfsvfs);
rrm_exit(&zfsvfs->z_teardown_lock, FTAG); rrm_exit(&zfsvfs->z_teardown_lock, FTAG);
if (err) { if (err) {
@ -2068,7 +2068,7 @@ int
zfs_end_fs(zfsvfs_t *zfsvfs, dsl_dataset_t *ds) zfs_end_fs(zfsvfs_t *zfsvfs, dsl_dataset_t *ds)
{ {
ASSERT(RRM_WRITE_HELD(&zfsvfs->z_teardown_lock)); ASSERT(RRM_WRITE_HELD(&zfsvfs->z_teardown_lock));
ASSERT(ZFS_TEARDOWN_INACTIVE_WLOCKED(zfsvfs)); ASSERT(ZFS_TEARDOWN_INACTIVE_WRITE_HELD(zfsvfs));
/* /*
* We already own this, so just hold and rele it to update the * We already own this, so just hold and rele it to update the
@ -2084,7 +2084,7 @@ zfs_end_fs(zfsvfs_t *zfsvfs, dsl_dataset_t *ds)
zfsvfs->z_os = os; zfsvfs->z_os = os;
/* release the VOPs */ /* release the VOPs */
ZFS_WUNLOCK_TEARDOWN_INACTIVE(zfsvfs); ZFS_TEARDOWN_INACTIVE_EXIT_WRITE(zfsvfs);
rrm_exit(&zfsvfs->z_teardown_lock, FTAG); rrm_exit(&zfsvfs->z_teardown_lock, FTAG);
/* /*

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

@ -4106,13 +4106,13 @@ zfs_inactive(vnode_t *vp, cred_t *cr, caller_context_t *ct)
zfsvfs_t *zfsvfs = zp->z_zfsvfs; zfsvfs_t *zfsvfs = zp->z_zfsvfs;
int error; int error;
ZFS_RLOCK_TEARDOWN_INACTIVE(zfsvfs); ZFS_TEARDOWN_INACTIVE_ENTER_READ(zfsvfs);
if (zp->z_sa_hdl == NULL) { if (zp->z_sa_hdl == NULL) {
/* /*
* The fs has been unmounted, or we did a * The fs has been unmounted, or we did a
* suspend/resume and this file no longer exists. * suspend/resume and this file no longer exists.
*/ */
ZFS_RUNLOCK_TEARDOWN_INACTIVE(zfsvfs); ZFS_TEARDOWN_INACTIVE_EXIT_READ(zfsvfs);
vrecycle(vp); vrecycle(vp);
return; return;
} }
@ -4121,7 +4121,7 @@ zfs_inactive(vnode_t *vp, cred_t *cr, caller_context_t *ct)
/* /*
* Fast path to recycle a vnode of a removed file. * Fast path to recycle a vnode of a removed file.
*/ */
ZFS_RUNLOCK_TEARDOWN_INACTIVE(zfsvfs); ZFS_TEARDOWN_INACTIVE_EXIT_READ(zfsvfs);
vrecycle(vp); vrecycle(vp);
return; return;
} }
@ -4141,7 +4141,7 @@ zfs_inactive(vnode_t *vp, cred_t *cr, caller_context_t *ct)
dmu_tx_commit(tx); dmu_tx_commit(tx);
} }
} }
ZFS_RUNLOCK_TEARDOWN_INACTIVE(zfsvfs); ZFS_TEARDOWN_INACTIVE_EXIT_READ(zfsvfs);
} }
@ -5274,10 +5274,10 @@ zfs_freebsd_need_inactive(struct vop_need_inactive_args *ap)
if (vn_need_pageq_flush(vp)) if (vn_need_pageq_flush(vp))
return (1); return (1);
if (!ZFS_TRYRLOCK_TEARDOWN_INACTIVE(zfsvfs)) if (!ZFS_TEARDOWN_INACTIVE_TRY_ENTER_READ(zfsvfs))
return (1); return (1);
need = (zp->z_sa_hdl == NULL || zp->z_unlinked || zp->z_atime_dirty); need = (zp->z_sa_hdl == NULL || zp->z_unlinked || zp->z_atime_dirty);
ZFS_RUNLOCK_TEARDOWN_INACTIVE(zfsvfs); ZFS_TEARDOWN_INACTIVE_EXIT_READ(zfsvfs);
return (need); return (need);
} }
@ -5308,12 +5308,12 @@ zfs_freebsd_reclaim(struct vop_reclaim_args *ap)
* zfs_znode_dmu_fini in zfsvfs_teardown during * zfs_znode_dmu_fini in zfsvfs_teardown during
* force unmount. * force unmount.
*/ */
ZFS_RLOCK_TEARDOWN_INACTIVE(zfsvfs); ZFS_TEARDOWN_INACTIVE_ENTER_READ(zfsvfs);
if (zp->z_sa_hdl == NULL) if (zp->z_sa_hdl == NULL)
zfs_znode_free(zp); zfs_znode_free(zp);
else else
zfs_zinactive(zp); zfs_zinactive(zp);
ZFS_RUNLOCK_TEARDOWN_INACTIVE(zfsvfs); ZFS_TEARDOWN_INACTIVE_EXIT_READ(zfsvfs);
vp->v_data = NULL; vp->v_data = NULL;
return (0); return (0);

2
module/os/freebsd/zfs/zfs_znode.c
View File

@ -372,7 +372,7 @@ zfs_znode_dmu_fini(znode_t *zp)
{ {
ASSERT(MUTEX_HELD(ZFS_OBJ_MUTEX(zp->z_zfsvfs, zp->z_id)) || ASSERT(MUTEX_HELD(ZFS_OBJ_MUTEX(zp->z_zfsvfs, zp->z_id)) ||
zp->z_unlinked || zp->z_unlinked ||
ZFS_TEARDOWN_INACTIVE_WLOCKED(zp->z_zfsvfs)); ZFS_TEARDOWN_INACTIVE_WRITE_HELD(zp->z_zfsvfs));
sa_handle_destroy(zp->z_sa_hdl); sa_handle_destroy(zp->z_sa_hdl);
zp->z_sa_hdl = NULL; zp->z_sa_hdl = NULL;