c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-31 03:04:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

FreeBSD: rename teardown inactive macros to mimick rrm convention

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
module/os/freebsd/zfs/zfs_vnops_os.c
+8 -8
View File
@@ -4106,13 +4106,13 @@ zfs_inactive(vnode_t *vp, cred_t *cr, caller_context_t *ct)
zfsvfs_t *zfsvfs = zp->z_zfsvfs;
int error;
ZFS_RLOCK_TEARDOWN_INACTIVE(zfsvfs);
ZFS_TEARDOWN_INACTIVE_ENTER_READ(zfsvfs);
if (zp->z_sa_hdl == NULL) {
/*
* The fs has been unmounted, or we did a
* suspend/resume and this file no longer exists.
*/
ZFS_RUNLOCK_TEARDOWN_INACTIVE(zfsvfs);
ZFS_TEARDOWN_INACTIVE_EXIT_READ(zfsvfs);
vrecycle(vp);
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.
*/
ZFS_RUNLOCK_TEARDOWN_INACTIVE(zfsvfs);
ZFS_TEARDOWN_INACTIVE_EXIT_READ(zfsvfs);
vrecycle(vp);
return;
}
@@ -4141,7 +4141,7 @@ zfs_inactive(vnode_t *vp, cred_t *cr, caller_context_t *ct)
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))
return (1);
if (!ZFS_TRYRLOCK_TEARDOWN_INACTIVE(zfsvfs))
if (!ZFS_TEARDOWN_INACTIVE_TRY_ENTER_READ(zfsvfs))
return (1);
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);
}
@@ -5308,12 +5308,12 @@ zfs_freebsd_reclaim(struct vop_reclaim_args *ap)
* zfs_znode_dmu_fini in zfsvfs_teardown during
* force unmount.
*/
ZFS_RLOCK_TEARDOWN_INACTIVE(zfsvfs);
ZFS_TEARDOWN_INACTIVE_ENTER_READ(zfsvfs);
if (zp->z_sa_hdl == NULL)
zfs_znode_free(zp);
else
zfs_zinactive(zp);
ZFS_RUNLOCK_TEARDOWN_INACTIVE(zfsvfs);
ZFS_TEARDOWN_INACTIVE_EXIT_READ(zfsvfs);
vp->v_data = NULL;
return (0);