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

FreeBSD: Satisfy ASSERT_VOP_IN_SEQC()

Browse Source 
zfs_aclset_common() might be called for newly created or not even
created vnodes, that triggers assertions on newer FreeBSD versions
with DEBUG_VFS_LOCKS included into INVARIANTS.  In the first case
make sure to call vn_seqc_write_begin()/_end(), in the second just
skip the assertion.

The similar has to be done for project management IOCTL and file-
bases extended attributes, since those are not going through VFS.

Signed-off-by: Alexander Motin <alexander.motin@TrueNAS.com>
Closes #17722
This commit is contained in:
Alexander Motin 2025-09-12 13:29:27 -04:00 committed by Tony Hutter
parent a68a9c726d
commit 12d3e1fc61
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1175,7 +1175,7 @@ zfs_aclset_common(znode_t *zp, zfs_acl_t *aclp, cred_t *cr, dmu_tx_t *tx)
int count = 0; int count = 0;
zfs_acl_phys_t acl_phys; zfs_acl_phys_t acl_phys;
if (zp->z_zfsvfs->z_replay == B_FALSE) { if (ZTOV(zp) != NULL && zp->z_zfsvfs->z_replay == B_FALSE) {
ASSERT_VOP_IN_SEQC(ZTOV(zp)); ASSERT_VOP_IN_SEQC(ZTOV(zp));
} }

6
module/os/freebsd/zfs/zfs_znode_os.c
View File

@ -794,6 +794,10 @@ zfs_mknode(znode_t *dzp, vattr_t *vap, dmu_tx_t *tx, cred_t *cr,
(*zpp)->z_mode = mode; (*zpp)->z_mode = mode;
(*zpp)->z_dnodesize = dnodesize; (*zpp)->z_dnodesize = dnodesize;
vnode_t *vp = ZTOV(*zpp);
if (!(flag & IS_ROOT_NODE))
vn_seqc_write_begin(vp);
if (vap->va_mask & AT_XVATTR) if (vap->va_mask & AT_XVATTR)
zfs_xvattr_set(*zpp, (xvattr_t *)vap, tx); zfs_xvattr_set(*zpp, (xvattr_t *)vap, tx);
@ -802,7 +806,7 @@ zfs_mknode(znode_t *dzp, vattr_t *vap, dmu_tx_t *tx, cred_t *cr,
VERIFY0(zfs_aclset_common(*zpp, acl_ids->z_aclp, cr, tx)); VERIFY0(zfs_aclset_common(*zpp, acl_ids->z_aclp, cr, tx));
} }
if (!(flag & IS_ROOT_NODE)) { if (!(flag & IS_ROOT_NODE)) {
vnode_t *vp = ZTOV(*zpp); vn_seqc_write_end(vp);
vp->v_vflag |= VV_FORCEINSMQ; vp->v_vflag |= VV_FORCEINSMQ;
int err = insmntque(vp, zfsvfs->z_vfs); int err = insmntque(vp, zfsvfs->z_vfs);
vp->v_vflag &= ~VV_FORCEINSMQ; vp->v_vflag &= ~VV_FORCEINSMQ;