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/fs/pseudofs | |
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/fs/pseudofs')
-rw-r--r-- | sys/fs/pseudofs/pseudofs.c | 10 | ||||
-rw-r--r-- | sys/fs/pseudofs/pseudofs_fileno.c | 4 | ||||
-rw-r--r-- | sys/fs/pseudofs/pseudofs_vncache.c | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sys/fs/pseudofs/pseudofs.c b/sys/fs/pseudofs/pseudofs.c index 8297ef6..67b3fae 100644 --- a/sys/fs/pseudofs/pseudofs.c +++ b/sys/fs/pseudofs/pseudofs.c @@ -92,7 +92,7 @@ _pfs_fixup_dir(struct pfs_node *parent) struct pfs_node *dir; MALLOC(dir, struct pfs_node *, sizeof *dir, - M_PFSNODES, M_WAITOK|M_ZERO); + M_PFSNODES, M_ZERO); dir->pn_name[0] = '.'; dir->pn_type = pfstype_this; @@ -102,7 +102,7 @@ _pfs_fixup_dir(struct pfs_node *parent) } MALLOC(dir, struct pfs_node *, sizeof *dir, - M_PFSNODES, M_WAITOK|M_ZERO); + M_PFSNODES, M_ZERO); dir->pn_name[0] = dir->pn_name[1] = '.'; dir->pn_type = pfstype_parent; @@ -127,7 +127,7 @@ pfs_create_dir(struct pfs_node *parent, char *name, ("%s(): node name is too long", __func__)); MALLOC(dir, struct pfs_node *, sizeof *dir, - M_PFSNODES, M_WAITOK|M_ZERO); + M_PFSNODES, M_ZERO); strcpy(dir->pn_name, name); dir->pn_type = (flags & PFS_PROCDEP) ? pfstype_procdir : pfstype_dir; dir->pn_attr = attr; @@ -160,7 +160,7 @@ pfs_create_file(struct pfs_node *parent, char *name, pfs_fill_t fill, ("%s(): node name is too long", __func__)); MALLOC(node, struct pfs_node *, sizeof *node, - M_PFSNODES, M_WAITOK|M_ZERO); + M_PFSNODES, M_ZERO); strcpy(node->pn_name, name); node->pn_type = pfstype_file; node->pn_func = fill; @@ -320,7 +320,7 @@ pfs_init(struct pfs_info *pi, struct vfsconf *vfc) /* set up the root diretory */ MALLOC(root, struct pfs_node *, sizeof *root, - M_PFSNODES, M_WAITOK|M_ZERO); + M_PFSNODES, M_ZERO); root->pn_type = pfstype_root; root->pn_name[0] = '/'; root->pn_info = pi; diff --git a/sys/fs/pseudofs/pseudofs_fileno.c b/sys/fs/pseudofs/pseudofs_fileno.c index 4341e23..0ca1640 100644 --- a/sys/fs/pseudofs/pseudofs_fileno.c +++ b/sys/fs/pseudofs/pseudofs_fileno.c @@ -82,7 +82,7 @@ pfs_fileno_init(struct pfs_info *pi) struct pfs_bitmap *pb; MALLOC(pb, struct pfs_bitmap *, sizeof *pb, - M_PFSFILENO, M_WAITOK|M_ZERO); + M_PFSFILENO, M_ZERO); mtx_lock(&pi->pi_mutex); @@ -144,7 +144,7 @@ pfs_get_fileno(struct pfs_info *pi) if (pb == NULL) { mtx_unlock(&pi->pi_mutex); MALLOC(pb, struct pfs_bitmap *, sizeof *pb, - M_PFSFILENO, M_WAITOK|M_ZERO); + M_PFSFILENO, M_ZERO); mtx_lock(&pi->pi_mutex); /* protect against possible race */ while (ppb->pb_next) diff --git a/sys/fs/pseudofs/pseudofs_vncache.c b/sys/fs/pseudofs/pseudofs_vncache.c index 76fdf3e..a1be1f1 100644 --- a/sys/fs/pseudofs/pseudofs_vncache.c +++ b/sys/fs/pseudofs/pseudofs_vncache.c @@ -132,7 +132,7 @@ pfs_vncache_alloc(struct mount *mp, struct vnode **vpp, ++pfs_vncache_misses; /* nope, get a new one */ - MALLOC(pvd, struct pfs_vdata *, sizeof *pvd, M_PFSVNCACHE, M_WAITOK); + MALLOC(pvd, struct pfs_vdata *, sizeof *pvd, M_PFSVNCACHE, 0); if (++pfs_vncache_entries > pfs_vncache_maxentries) pfs_vncache_maxentries = pfs_vncache_entries; error = getnewvnode("pseudofs", mp, pfs_vnodeop_p, vpp); |