d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Protect the mnt_vnode list with the mntvnode lock.

Browse Source
This commit is contained in:
jhb 2001-06-28 03:50:17 +00:00
parent fe47a79f92
commit 54c05ef2f2
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/fs/nwfs/nwfs_vfsops.c
View File

@ -471,30 +471,41 @@ nwfs_sync(mp, waitfor, cred, p)
struct ucred *cred;
struct proc *p;
{
struct vnode *vp;
struct vnode *vp, *nvp;
int error, allerror = 0;
/*
* Force stale buffer cache information to be flushed.
*/
mtx_lock(&mntvnode_mtx);
loop:
for (vp = LIST_FIRST(&mp->mnt_vnodelist);
vp != NULL;
vp = LIST_NEXT(vp, v_mntvnodes)) {
vp = nvp) {
/*
* If the vnode that we are about to sync is no longer
* associated with this mount point, start over.
*/
if (vp->v_mount != mp)
goto loop;
nvp = LIST_NEXT(vp, v_mntvnodes);
mtx_unlock(&mntvnode_mtx);
mtx_lock(&vp->v_interlock);
if (VOP_ISLOCKED(vp, NULL) || TAILQ_EMPTY(&vp->v_dirtyblkhd) ||
waitfor == MNT_LAZY)
waitfor == MNT_LAZY) {
mtx_unlock(&vp->v_interlock);
mtx_lock(&mntvnode_mtx);
continue;
if (vget(vp, LK_EXCLUSIVE, p))
}
if (vget(vp, LK_EXCLUSIVE | LK_INTERLOCK, p)) {
mtx_lock(&mntvnode_mtx);
goto loop;
}
error = VOP_FSYNC(vp, cred, waitfor, p);
if (error)
allerror = error;
vput(vp);
mtx_lock(&mntvnode_mtx);
}
mtx_unlock(&mntvnode_mtx);
return (allerror);
}

4
sys/fs/unionfs/union_vfsops.c
View File

@ -45,6 +45,8 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/proc.h>
#include <sys/vnode.h>
#include <sys/mount.h>
@ -330,9 +332,11 @@ union_unmount(mp, mntflags, p)
int n;
/* count #vnodes held on mount list */
mtx_lock(&mntvnode_mtx);
n = 0;
LIST_FOREACH(vp, &mp->mnt_vnodelist, v_mntvnodes)
n++;
mtx_unlock(&mntvnode_mtx);
/* if this is unchanged then stop */
if (n == freeing)