diff options
| author | Sebastien Marie <semarie@cvs.openbsd.org> | 2021-10-19 06:26:10 +0000 |
|---|---|---|
| committer | Sebastien Marie <semarie@cvs.openbsd.org> | 2021-10-19 06:26:10 +0000 |
| commit | d7e62bb318a2cfa9aae0aec0c2f1a9a910ff1598 (patch) | |
| tree | 798f01e933d7433c47eb426b7d6bb00d3bd5f0a5 /sys/ufs | |
| parent | ad99ca7b42f45873f9f031d43db6672230f5fcf0 (diff) | |
vnode: remove VLOCKSWORK and check locking when vop_islocked != nullop
This flag is currently used to mark or unmark a vnode to actively
check vnode locking semantic (when compiled with VFSLCKDEBUG).
Currently, VLOCKSWORK flag isn't properly set for several FS
implementation which have full locking support. This commit enable
proper checking for them too (cd9660, udf, fuse, msdosfs, tmpfs).
Instead of using a particular flag, it directly check if
v_op->vop_islocked is nullop or not to activate or not the vnode
locking checks.
ok mpi@
Diffstat (limited to 'sys/ufs')
| -rw-r--r-- | sys/ufs/ext2fs/ext2fs_subr.c | 5 | ||||
| -rw-r--r-- | sys/ufs/ffs/ffs_subr.c | 5 | ||||
| -rw-r--r-- | sys/ufs/ffs/ffs_vfsops.c | 5 |
3 files changed, 3 insertions, 12 deletions
diff --git a/sys/ufs/ext2fs/ext2fs_subr.c b/sys/ufs/ext2fs/ext2fs_subr.c index d859d216b40..b0fb0323818 100644 --- a/sys/ufs/ext2fs/ext2fs_subr.c +++ b/sys/ufs/ext2fs/ext2fs_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ext2fs_subr.c,v 1.35 2016/08/10 07:53:02 natano Exp $ */ +/* $OpenBSD: ext2fs_subr.c,v 1.36 2021/10/19 06:26:09 semarie Exp $ */ /* $NetBSD: ext2fs_subr.c,v 1.1 1997/06/11 09:34:03 bouyer Exp $ */ /* @@ -170,9 +170,6 @@ ext2fs_vinit(struct mount *mp, struct vnode **vpp) nvp->v_data = vp->v_data; vp->v_data = NULL; vp->v_op = &spec_vops; -#ifdef VFSLCKDEBUG - vp->v_flag &= ~VLOCKSWORK; -#endif vrele(vp); vgone(vp); /* Reinitialize aliased vnode. */ diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c index 2aedef06acf..7cc6a54a8d9 100644 --- a/sys/ufs/ffs/ffs_subr.c +++ b/sys/ufs/ffs/ffs_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs_subr.c,v 1.32 2016/08/10 11:33:01 natano Exp $ */ +/* $OpenBSD: ffs_subr.c,v 1.33 2021/10/19 06:26:09 semarie Exp $ */ /* $NetBSD: ffs_subr.c,v 1.6 1996/03/17 02:16:23 christos Exp $ */ /* @@ -272,9 +272,6 @@ ffs_vinit(struct mount *mntp, struct vnode **vpp) nvp->v_data = vp->v_data; vp->v_data = NULL; vp->v_op = &spec_vops; -#ifdef VFSLCKDEBUG - vp->v_flag &= ~VLOCKSWORK; -#endif vrele(vp); vgone(vp); /* diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index 48303e6a811..0b40150c13a 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs_vfsops.c,v 1.190 2021/10/04 08:11:02 claudio Exp $ */ +/* $OpenBSD: ffs_vfsops.c,v 1.191 2021/10/19 06:26:09 semarie Exp $ */ /* $NetBSD: ffs_vfsops.c,v 1.19 1996/02/09 22:22:26 christos Exp $ */ /* @@ -1324,9 +1324,6 @@ retry: return (error); } -#ifdef VFSLCKDEBUG - vp->v_flag |= VLOCKSWORK; -#endif ip = pool_get(&ffs_ino_pool, PR_WAITOK|PR_ZERO); rrw_init_flags(&ip->i_lock, "inode", RWL_DUPOK | RWL_IS_VNODE); ip->i_ump = ump; |