aboutsummaryrefslogtreecommitdiff
path: root/sys/fs/portalfs
diff options
context:
space:
mode:
authorJeff Roberson <jeff@FreeBSD.org>2002-08-04 10:29:36 +0000
committerJeff Roberson <jeff@FreeBSD.org>2002-08-04 10:29:36 +0000
commite6e370a7fe930e04cec38bcc2e06be127ed7ee02 (patch)
treee889f56910bf98cbee3be239655a9e4bbb928b2e /sys/fs/portalfs
parentf75bb0aa25847511ed461bccb4d3fc247ab6b1d5 (diff)
downloadsrc-e6e370a7fe930e04cec38bcc2e06be127ed7ee02.tar.gz
src-e6e370a7fe930e04cec38bcc2e06be127ed7ee02.zip
- 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
Notes
Notes: svn path=/head/; revision=101308
Diffstat (limited to 'sys/fs/portalfs')
-rw-r--r--sys/fs/portalfs/portal_vfsops.c2
-rw-r--r--sys/fs/portalfs/portal_vnops.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/fs/portalfs/portal_vfsops.c b/sys/fs/portalfs/portal_vfsops.c
index c0f4022dcf58..025721b84aaa 100644
--- a/sys/fs/portalfs/portal_vfsops.c
+++ b/sys/fs/portalfs/portal_vfsops.c
@@ -128,7 +128,7 @@ portal_mount(mp, path, data, ndp, td)
rvp->v_data = pn;
rvp->v_type = VDIR;
- rvp->v_flag |= VROOT;
+ rvp->v_vflag |= VV_ROOT;
VTOPORTAL(rvp)->pt_arg = 0;
VTOPORTAL(rvp)->pt_size = 0;
VTOPORTAL(rvp)->pt_fileid = PORTAL_ROOTFILEID;
diff --git a/sys/fs/portalfs/portal_vnops.c b/sys/fs/portalfs/portal_vnops.c
index b345c573d4be..2d56232378d3 100644
--- a/sys/fs/portalfs/portal_vnops.c
+++ b/sys/fs/portalfs/portal_vnops.c
@@ -229,7 +229,7 @@ portal_open(ap)
/*
* Nothing to do when opening the root node.
*/
- if (vp->v_flag & VROOT)
+ if (vp->v_vflag & VV_ROOT)
return (0);
/*
@@ -462,7 +462,7 @@ portal_getattr(ap)
/* vap->va_qbytes = 0; */
vap->va_bytes = 0;
/* vap->va_qsize = 0; */
- if (vp->v_flag & VROOT) {
+ if (vp->v_vflag & VV_ROOT) {
vap->va_type = VDIR;
vap->va_mode = S_IRUSR|S_IWUSR|S_IXUSR|
S_IRGRP|S_IWGRP|S_IXGRP|
@@ -493,7 +493,7 @@ portal_setattr(ap)
/*
* Can't mess with the root vnode
*/
- if (ap->a_vp->v_flag & VROOT)
+ if (ap->a_vp->v_vflag & VV_ROOT)
return (EACCES);
if (ap->a_vap->va_flags != VNOVAL)