diff options
author | mckusick <mckusick@FreeBSD.org> | 2002-10-14 03:20:36 +0000 |
---|---|---|
committer | mckusick <mckusick@FreeBSD.org> | 2002-10-14 03:20:36 +0000 |
commit | 25230d4c6a8ce0a2007e1b2694fcc4ff0869e15c (patch) | |
tree | 002d16cf963ee442c7680ba065d71a690c88783a /sys/fs/nullfs | |
parent | 2cf51225e1370232cb1606878600b9f10c5fd223 (diff) | |
download | FreeBSD-src-25230d4c6a8ce0a2007e1b2694fcc4ff0869e15c.zip FreeBSD-src-25230d4c6a8ce0a2007e1b2694fcc4ff0869e15c.tar.gz |
Regularize the vop_stdlock'ing protocol across all the filesystems
that use it. Specifically, vop_stdlock uses the lock pointed to by
vp->v_vnlock. By default, getnewvnode sets up vp->v_vnlock to
reference vp->v_lock. Filesystems that wish to use the default
do not need to allocate a lock at the front of their node structure
(as some still did) or do a lockinit. They can simply start using
vn_lock/VOP_UNLOCK. Filesystems that wish to manage their own locks,
but still use the vop_stdlock functions (such as nullfs) can simply
replace vp->v_vnlock with a pointer to the lock that they wish to
have used for the vnode. Such filesystems are responsible for
setting the vp->v_vnlock back to the default in their vop_reclaim
routine (e.g., vp->v_vnlock = &vp->v_lock).
In theory, this set of changes cleans up the existing filesystem
lock interface and should have no function change to the existing
locking scheme.
Sponsored by: DARPA & NAI Labs.
Diffstat (limited to 'sys/fs/nullfs')
-rw-r--r-- | sys/fs/nullfs/null_subr.c | 3 | ||||
-rw-r--r-- | sys/fs/nullfs/null_vnops.c | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/sys/fs/nullfs/null_subr.c b/sys/fs/nullfs/null_subr.c index 1fdd210..f2a43e0 100644 --- a/sys/fs/nullfs/null_subr.c +++ b/sys/fs/nullfs/null_subr.c @@ -226,9 +226,6 @@ null_nodeget(mp, lowervp, vpp) vp->v_type = lowervp->v_type; vp->v_data = xp; - /* Though v_lock is inited by getnewvnode(), we want our own wmesg */ - lockinit(&vp->v_lock, PVFS, "nunode", VLKTIMEOUT, LK_NOPAUSE); - /* * From NetBSD: * Now lock the new node. We rely on the fact that we were passed diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c index 5f46b2f..69d72bc 100644 --- a/sys/fs/nullfs/null_vnops.c +++ b/sys/fs/nullfs/null_vnops.c @@ -758,6 +758,7 @@ null_reclaim(ap) } vp->v_data = NULL; + vp->v_vnlock = &vp->v_lock; FREE(xp, M_NULLFSNODE); return (0); |