diff options
author | alfred <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
---|---|---|
committer | alfred <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
commit | bf8e8a6e8f0bd9165109f0a258730dd242299815 (patch) | |
tree | f16a2fb9fa7a7fbc4c19e981d278d5f6eb53234d /sys/kern/vfs_subr.c | |
parent | 2180deee00350fff613a1d1d1328eddc4c0ba9c8 (diff) | |
download | FreeBSD-src-bf8e8a6e8f0bd9165109f0a258730dd242299815.zip FreeBSD-src-bf8e8a6e8f0bd9165109f0a258730dd242299815.tar.gz |
Remove M_TRYWAIT/M_WAITOK/M_WAIT. Callers should use 0.
Merge M_NOWAIT/M_DONTWAIT into a single flag M_NOWAIT.
Diffstat (limited to 'sys/kern/vfs_subr.c')
-rw-r--r-- | sys/kern/vfs_subr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 8e954eb..7f3af03 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -452,7 +452,7 @@ vop_lock_post(void *ap, int rc) void v_addpollinfo(struct vnode *vp) { - vp->v_pollinfo = uma_zalloc(vnodepoll_zone, M_WAITOK); + vp->v_pollinfo = uma_zalloc(vnodepoll_zone, 0); mtx_init(&vp->v_pollinfo->vpi_lock, "vnode pollinfo", NULL, MTX_DEF); } @@ -996,7 +996,7 @@ getnewvnode(tag, mp, vops, vpp) numvnodes++; mtx_unlock(&vnode_free_list_mtx); - vp = (struct vnode *) uma_zalloc(vnode_zone, M_WAITOK|M_ZERO); + vp = (struct vnode *) uma_zalloc(vnode_zone, M_ZERO); mtx_init(&vp->v_interlock, "vnode interlock", NULL, MTX_DEF); VI_LOCK(vp); vp->v_dd = vp; @@ -2938,7 +2938,7 @@ sysctl_vfs_conflist(SYSCTL_HANDLER_ARGS) cnt = 0; for (vfsp = vfsconf; vfsp != NULL; vfsp = vfsp->vfc_next) cnt++; - xvfsp = malloc(sizeof(struct xvfsconf) * cnt, M_TEMP, M_WAITOK); + xvfsp = malloc(sizeof(struct xvfsconf) * cnt, M_TEMP, 0); /* * Handle the race that we will have here when struct vfsconf * will be locked down by using both cnt and checking vfc_next @@ -3051,7 +3051,7 @@ sysctl_vnode(SYSCTL_HANDLER_ARGS) return (SYSCTL_OUT(req, 0, len)); sysctl_wire_old_buffer(req, 0); - xvn = malloc(len, M_TEMP, M_ZERO | M_WAITOK); + xvn = malloc(len, M_TEMP, M_ZERO | 0); n = 0; mtx_lock(&mountlist_mtx); TAILQ_FOREACH(mp, &mountlist, mnt_list) { |