diff options
| author | Nikolay Sturm <sturm@cvs.openbsd.org> | 2006-06-25 15:01:55 +0000 |
|---|---|---|
| committer | Nikolay Sturm <sturm@cvs.openbsd.org> | 2006-06-25 15:01:55 +0000 |
| commit | 1997cc0f7600801eaee09b3bd08785f982706534 (patch) | |
| tree | fb656be1b4ad6dcd594b6084743ac48d5b4f5f7c /sys/kern/vfs_subr.c | |
| parent | dea3211dddeba2e25005fa356b8cfc9352831cb5 (diff) | |
rename vfs_busy() flags VB_UMIGNORE/VB_UMWAIT to VB_NOWAIT/VB_WAIT
requested by and ok pedro
Diffstat (limited to 'sys/kern/vfs_subr.c')
| -rw-r--r-- | sys/kern/vfs_subr.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 88458c67924..71e8e0c0ba8 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_subr.c,v 1.128 2006/06/14 20:01:50 sturm Exp $ */ +/* $OpenBSD: vfs_subr.c,v 1.129 2006/06/25 15:01:53 sturm Exp $ */ /* $NetBSD: vfs_subr.c,v 1.53 1996/04/22 01:39:13 christos Exp $ */ /* @@ -162,7 +162,7 @@ vfs_busy(struct mount *mp, int flags) else rwflags |= RW_READ; - if (flags & VB_UMWAIT) + if (flags & VB_WAIT) rwflags |= RW_SLEEPFAIL; else rwflags |= RW_NOSLEEP; @@ -210,7 +210,7 @@ vfs_rootmountalloc(char *fstypename, char *devname, struct mount **mpp) return (ENODEV); mp = malloc((u_long)sizeof(struct mount), M_MOUNT, M_WAITOK); bzero((char *)mp, (u_long)sizeof(struct mount)); - (void) vfs_busy(mp, VB_READ|VB_UMIGNORE); + (void) vfs_busy(mp, VB_READ|VB_NOWAIT); LIST_INIT(&mp->mnt_vnodelist); mp->mnt_vfc = vfsp; mp->mnt_op = vfsp->vfc_vfsops; @@ -1162,7 +1162,7 @@ vgonel(struct vnode *vp, struct proc *p) */ mp = vp->v_specmountpoint; if (mp != NULL) { - if (!vfs_busy(mp, VB_WRITE|VB_UMWAIT)) { + if (!vfs_busy(mp, VB_WRITE|VB_WAIT)) { flags = MNT_FORCE | MNT_DOOMED; dounmount(mp, flags, p, NULL); } @@ -1329,7 +1329,7 @@ printlockedvnodes(void) for (mp = CIRCLEQ_FIRST(&mountlist); mp != CIRCLEQ_END(&mountlist); mp = nmp) { - if (vfs_busy(mp, VB_READ|VB_UMIGNORE)) { + if (vfs_busy(mp, VB_READ|VB_NOWAIT)) { nmp = CIRCLEQ_NEXT(mp, mnt_list); continue; } @@ -1416,7 +1416,7 @@ sysctl_vnode(char *where, size_t *sizep, struct proc *p) for (mp = CIRCLEQ_FIRST(&mountlist); mp != CIRCLEQ_END(&mountlist); mp = nmp) { - if (vfs_busy(mp, VB_READ|VB_UMIGNORE)) { + if (vfs_busy(mp, VB_READ|VB_NOWAIT)) { nmp = CIRCLEQ_NEXT(mp, mnt_list); continue; } @@ -1717,7 +1717,7 @@ vfs_unmountall(void) for (mp = CIRCLEQ_LAST(&mountlist); mp != CIRCLEQ_END(&mountlist); mp = nmp) { nmp = CIRCLEQ_PREV(mp, mnt_list); - if ((vfs_busy(mp, VB_WRITE|VB_UMIGNORE)) != 0) + if ((vfs_busy(mp, VB_WRITE|VB_NOWAIT)) != 0) continue; if ((error = dounmount(mp, MNT_FORCE, curproc, NULL)) != 0) { printf("unmount of %s failed with error %d\n", |