From 02517b6731ab2da44ce9b49260429744cf0114d5 Mon Sep 17 00:00:00 2001 From: jeff Date: Sun, 4 Aug 2002 10:29:36 +0000 Subject: - Replace v_flag with v_iflag and v_vflag - v_vflag is protected by the vnode lock and is used when synchronization with VOP calls is needed. - v_iflag is protected by interlock and is used for dealing with vnode management issues. These flags include X/O LOCK, FREE, DOOMED, etc. - All accesses to v_iflag and v_vflag have either been locked or marked with mp_fixme's. - Many ASSERT_VOP_LOCKED calls have been added where the locking was not clear. - Many functions in vfs_subr.c were restructured to provide for stronger locking. Idea stolen from: BSD/OS --- sys/security/lomac/kernel_interface.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sys/security/lomac/kernel_interface.c') diff --git a/sys/security/lomac/kernel_interface.c b/sys/security/lomac/kernel_interface.c index adaff99..c4a0c04 100644 --- a/sys/security/lomac/kernel_interface.c +++ b/sys/security/lomac/kernel_interface.c @@ -374,7 +374,7 @@ set_object_lattr(lomac_object_t *obj, lattr_t lattr) { vp = obj->lo_object.vnode; KASSERT(!VISLOMAC(vp), ("is a LOMACFS vnode")); VI_LOCK(vp); - vp->v_flag = (vp->v_flag & ~(UV_LEVEL_MASK | UV_ATTR_MASK)) | + vp->v_iflag = (vp->v_iflag & ~(UV_LEVEL_MASK | UV_ATTR_MASK)) | level2uvnodebits(lattr.level) | attr2uvnodebits(lattr.flags); VI_UNLOCK(vp); @@ -453,8 +453,8 @@ get_object_lattr(const lomac_object_t *obj, lattr_t *lattr) { vp = obj->lo_object.vnode; KASSERT(!VISLOMAC(vp), ("is a LOMACFS vnode")); VI_LOCK(vp); - lattr->level = uvnodebits2level(vp->v_flag); - lattr->flags = uvnodebits2attr(vp->v_flag); + lattr->level = uvnodebits2level(vp->v_iflag); + lattr->flags = uvnodebits2attr(vp->v_iflag); VI_UNLOCK(vp); break; case LO_TYPE_VM_OBJECT: -- cgit v1.1