Remove M_TRYWAIT/M_WAITOK/M_WAIT. Callers should use 0.

Merge M_NOWAIT/M_DONTWAIT into a single flag M_NOWAIT.

2 files changed, 6 insertions, 6 deletions

diff --git a/sys/fs/udf/udf_vfsops.c b/sys/fs/udf/udf_vfsops.c
index b41b86b..2e7df0a 100644
--- a/sys/fs/udf/udf_vfsops.c
+++ b/sys/fs/udf/udf_vfsops.c
@@ -562,7 +562,7 @@ udf_vget(struct mount *mp, ino_t ino, int flags, struct vnode **vpp)
 	 * Allocate memory and check the tag id's before grabbing a new
 	 * vnode, since it's hard to roll back if there is a problem.
 	 */
-	unode = uma_zalloc(udf_zone_node, M_WAITOK);
+	unode = uma_zalloc(udf_zone_node, 0);
 	if (unode == NULL) {
 		printf("Cannot allocate udf node\n");
 		return (ENOMEM);
diff --git a/sys/fs/udf/udf_vnops.c b/sys/fs/udf/udf_vnops.c
index 8d9be57..f6d5fd2 100644
--- a/sys/fs/udf/udf_vnops.c
+++ b/sys/fs/udf/udf_vnops.c
@@ -449,7 +449,7 @@ udf_transname(char *cs0string, char *destname, int len)
 	int i, unilen = 0;
 
 	/* allocate a buffer big enough to hold an 8->16 bit expansion */
-	transname = uma_zalloc(udf_zone_trans, M_WAITOK);
+	transname = uma_zalloc(udf_zone_trans, 0);
 
 	if ((unilen = udf_UncompressUnicode(len, cs0string, transname)) == -1) {
 		printf("udf: Unicode translation failed\n");
@@ -486,7 +486,7 @@ udf_cmpname(char *cs0string, char *cmpname, int cs0len, int cmplen)
 	int error = 0;
 
 	/* This is overkill, but not worth creating a new zone */
-	transname = uma_zalloc(udf_zone_trans, M_WAITOK);
+	transname = uma_zalloc(udf_zone_trans, 0);
 
 	cs0len = udf_transname(cs0string, transname, cs0len);
 
@@ -532,7 +532,7 @@ udf_opendir(struct udf_node *node, int offset, int fsize, struct udf_mnt *udfmp)
 {
 	struct udf_dirstream *ds;
 
-	ds = uma_zalloc(udf_zone_ds, M_WAITOK | M_ZERO);
+	ds = uma_zalloc(udf_zone_ds, M_ZERO);
 
 	ds->node = node;
 	ds->offset = offset;
@@ -597,7 +597,7 @@ udf_getfid(struct udf_dirstream *ds)
 		 * logical sector in size.
 		 */
 		MALLOC(ds->buf, uint8_t*, ds->udfmp->bsize, M_UDFFID,
-		     M_WAITOK | M_ZERO);
+		     M_ZERO);
 		bcopy(fid, ds->buf, frag_size);
 
 		/* Reduce all of the casting magic */
@@ -697,7 +697,7 @@ udf_readdir(struct vop_readdir_args *a)
 		 */
 		ncookies = uio->uio_resid / 8;
 		MALLOC(cookies, u_long *, sizeof(u_long) * ncookies,
-		    M_TEMP, M_WAITOK);
+		    M_TEMP, 0);
 		if (cookies == NULL)
 			return (ENOMEM);
 		uiodir.ncookies = ncookies;