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

Merge M_NOWAIT/M_DONTWAIT into a single flag M_NOWAIT.

9 files changed, 29 insertions, 29 deletions

diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c
index ed4e04c..7af8b69 100644
--- a/sys/ufs/ffs/ffs_inode.c
+++ b/sys/ufs/ffs/ffs_inode.c
@@ -573,7 +573,7 @@ ffs_indirtrunc(ip, lbn, dbn, lastbn, level, countp)
 	else
 		bap2 = (ufs2_daddr_t *)bp->b_data;
 	if (lastbn != -1) {
-		MALLOC(copy, caddr_t, fs->fs_bsize, M_TEMP, M_WAITOK);
+		MALLOC(copy, caddr_t, fs->fs_bsize, M_TEMP, 0);
 		bcopy((caddr_t)bp->b_data, copy, (u_int)fs->fs_bsize);
 		for (i = last + 1; i < NINDIR(fs); i++)
 			BAP(ip, i) = 0;
diff --git a/sys/ufs/ffs/ffs_snapshot.c b/sys/ufs/ffs/ffs_snapshot.c
index 7fe373d..b26d10b 100644
--- a/sys/ufs/ffs/ffs_snapshot.c
+++ b/sys/ufs/ffs/ffs_snapshot.c
@@ -269,7 +269,7 @@ restart:
 	 * the suspension period.
 	 */
 	len = howmany(fs->fs_ncg, NBBY);
-	MALLOC(fs->fs_active, int *, len, M_DEVBUF, M_WAITOK);
+	MALLOC(fs->fs_active, int *, len, M_DEVBUF, 0);
 	bzero(fs->fs_active, len);
 	for (cg = 0; cg < fs->fs_ncg; cg++) {
 		error = UFS_BALLOC(vp, (off_t)(cgtod(fs, cg)) << fs->fs_fshift,
@@ -359,7 +359,7 @@ restart:
 	size = blkroundup(fs, fs->fs_cssize);
 	if (fs->fs_contigsumsize > 0)
 		size += fs->fs_ncg * sizeof(int32_t);
-	space = malloc((u_long)size, M_UFSMNT, M_WAITOK);
+	space = malloc((u_long)size, M_UFSMNT, 0);
 	copy_fs->fs_csp = space;
 	bcopy(fs->fs_csp, copy_fs->fs_csp, fs->fs_cssize);
 	(char *)space += fs->fs_cssize;
@@ -473,7 +473,7 @@ loop:
 
 		VI_UNLOCK(devvp);
 		MALLOC(lkp, struct lock *, sizeof(struct lock), M_UFSMNT,
-		    M_WAITOK);
+		    0);
 		lockinit(lkp, PVFS, "snaplk", VLKTIMEOUT,
 		    LK_CANRECURSE | LK_NOPAUSE);
 		VI_LOCK(vp);
@@ -536,7 +536,7 @@ out1:
 	snaplistsize = fs->fs_ncg + howmany(fs->fs_cssize, fs->fs_bsize) +
 	    FSMAXSNAP + 1 /* superblock */ + 1 /* last block */ + 1 /* size */;
 	MALLOC(snapblklist, daddr_t *, snaplistsize * sizeof(daddr_t),
-	    M_UFSMNT, M_WAITOK);
+	    M_UFSMNT, 0);
 	ip->i_snapblklist = &snapblklist[1];
 	/*
 	 * Expunge the blocks used by the snapshots from the set of
@@ -872,7 +872,7 @@ indiracct_ufs1(snapvp, cancelvp, level, blkno, lbn, rlbn, remblks,
 	last = howmany(remblks, blksperindir);
 	if (last > NINDIR(fs))
 		last = NINDIR(fs);
-	MALLOC(bap, ufs1_daddr_t *, fs->fs_bsize, M_DEVBUF, M_WAITOK);
+	MALLOC(bap, ufs1_daddr_t *, fs->fs_bsize, M_DEVBUF, 0);
 	bcopy(bp->b_data, (caddr_t)bap, fs->fs_bsize);
 	bqrelse(bp);
 	error = (*acctfunc)(snapvp, &bap[0], &bap[last], fs,
@@ -1147,7 +1147,7 @@ indiracct_ufs2(snapvp, cancelvp, level, blkno, lbn, rlbn, remblks,
 	last = howmany(remblks, blksperindir);
 	if (last > NINDIR(fs))
 		last = NINDIR(fs);
-	MALLOC(bap, ufs2_daddr_t *, fs->fs_bsize, M_DEVBUF, M_WAITOK);
+	MALLOC(bap, ufs2_daddr_t *, fs->fs_bsize, M_DEVBUF, 0);
 	bcopy(bp->b_data, (caddr_t)bap, fs->fs_bsize);
 	bqrelse(bp);
 	error = (*acctfunc)(snapvp, &bap[0], &bap[last], fs,
@@ -1731,7 +1731,7 @@ ffs_snapshot_mount(mp)
 
 			VI_UNLOCK(devvp);
 			MALLOC(lkp, struct lock *, sizeof(struct lock),
-			    M_UFSMNT, M_WAITOK);
+			    M_UFSMNT, 0);
 			lockinit(lkp, PVFS, "snaplk", VLKTIMEOUT,
 			    LK_CANRECURSE | LK_NOPAUSE);
 			VI_LOCK(vp);
@@ -1779,7 +1779,7 @@ ffs_snapshot_mount(mp)
 		return;
 	}
 	MALLOC(snapblklist, void *, snaplistsize * sizeof(daddr_t),
-	    M_UFSMNT, M_WAITOK);
+	    M_UFSMNT, 0);
 	auio.uio_iovcnt = 1;
 	aiov.iov_base = snapblklist;
 	aiov.iov_len = snaplistsize * sizeof (daddr_t);
diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c
index 872433d..fcc8929 100644
--- a/sys/ufs/ffs/ffs_softdep.c
+++ b/sys/ufs/ffs/ffs_softdep.c
@@ -96,7 +96,7 @@ static MALLOC_DEFINE(M_MKDIR, "mkdir","New directory");
 static MALLOC_DEFINE(M_DIRREM, "dirrem","Directory entry deleted");
 static MALLOC_DEFINE(M_NEWDIRBLK, "newdirblk","Unclaimed new directory block");
 
-#define M_SOFTDEP_FLAGS	(M_WAITOK | M_USE_RESERVE)
+#define M_SOFTDEP_FLAGS	(M_USE_RESERVE)
 
 #define	D_PAGEDEP	0
 #define	D_INODEDEP	1
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index e29cdb6..203ad03 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -686,9 +686,9 @@ ffs_mountfs(devvp, mp, td)
 		fs->fs_pendingblocks = 0;
 		fs->fs_pendinginodes = 0;
 	}
-	ump = malloc(sizeof *ump, M_UFSMNT, M_WAITOK | M_ZERO);
+	ump = malloc(sizeof *ump, M_UFSMNT, M_ZERO);
 	ump->um_fs = malloc((u_long)fs->fs_sbsize, M_UFSMNT,
-	    M_WAITOK);
+	    0);
 	if (fs->fs_magic == FS_UFS1_MAGIC) {
 		ump->um_fstype = UFS1;
 		ump->um_balloc = ffs_balloc_ufs1;
@@ -715,7 +715,7 @@ ffs_mountfs(devvp, mp, td)
 	if (fs->fs_contigsumsize > 0)
 		size += fs->fs_ncg * sizeof(int32_t);
 	size += fs->fs_ncg * sizeof(u_int8_t);
-	space = malloc((u_long)size, M_UFSMNT, M_WAITOK);
+	space = malloc((u_long)size, M_UFSMNT, 0);
 	fs->fs_csp = space;
 	for (i = 0; i < blks; i += fs->fs_frag) {
 		size = fs->fs_bsize;
@@ -1248,7 +1248,7 @@ ffs_vget(mp, ino, flags, vpp)
 	 * which will cause a panic because ffs_sync() blindly
 	 * dereferences vp->v_data (as well it should).
 	 */
-	ip = uma_zalloc(uma_inode, M_WAITOK);
+	ip = uma_zalloc(uma_inode, 0);
 
 	/* Allocate a new vnode/inode. */
 	error = getnewvnode("ufs", mp, ffs_vnodeop_p, &vp);
@@ -1315,9 +1315,9 @@ ffs_vget(mp, ino, flags, vpp)
 		return (error);
 	}
 	if (ip->i_ump->um_fstype == UFS1)
-		ip->i_din1 = uma_zalloc(uma_ufs1, M_WAITOK);
+		ip->i_din1 = uma_zalloc(uma_ufs1, 0);
 	else
-		ip->i_din2 = uma_zalloc(uma_ufs2, M_WAITOK);
+		ip->i_din2 = uma_zalloc(uma_ufs2, 0);
 	ffs_load_inode(bp, ip, fs, ino);
 	if (DOINGSOFTDEP(vp))
 		softdep_load_inodeblock(ip);
diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c
index 626b156..6213a49 100644
--- a/sys/ufs/ffs/ffs_vnops.c
+++ b/sys/ufs/ffs/ffs_vnops.c
@@ -1382,7 +1382,7 @@ ffs_rdextattr(u_char **p, struct vnode *vp, struct thread *td, int extra)
 	dp = ip->i_din2;
 	easize = dp->di_extsize;
 
-	eae = malloc(easize + extra, M_TEMP, M_WAITOK);
+	eae = malloc(easize + extra, M_TEMP, 0);
 
 	liovec.iov_base = eae;
 	liovec.iov_len = easize;
@@ -1707,7 +1707,7 @@ vop_setextattr {
 		ealength += eapad1 + ealen + eapad2;
 	}
 
-	eae = malloc(ip->i_ea_len + ealength, M_TEMP, M_WAITOK);
+	eae = malloc(ip->i_ea_len + ealength, M_TEMP, 0);
 	bcopy(ip->i_ea_area, eae, ip->i_ea_len);
 	easize = ip->i_ea_len;
 
diff --git a/sys/ufs/ufs/ufs_dirhash.c b/sys/ufs/ufs/ufs_dirhash.c
index f2d3a70..27d32ef 100644
--- a/sys/ufs/ufs/ufs_dirhash.c
+++ b/sys/ufs/ufs/ufs_dirhash.c
@@ -187,7 +187,7 @@ ufsdirhash_build(struct inode *ip)
 		goto fail;
 	for (i = 0; i < narrays; i++) {
 		if ((dh->dh_hash[i] = uma_zalloc(ufsdirhash_zone,
-		    M_WAITOK)) == NULL)
+		    0)) == NULL)
 			goto fail;
 		for (j = 0; j < DH_NBLKOFF; j++)
 			dh->dh_hash[i][j] = DIRHASH_EMPTY;
diff --git a/sys/ufs/ufs/ufs_extattr.c b/sys/ufs/ufs/ufs_extattr.c
index 3d999b1..57d30e7 100644
--- a/sys/ufs/ufs/ufs_extattr.c
+++ b/sys/ufs/ufs/ufs_extattr.c
@@ -254,7 +254,7 @@ ufs_extattr_lookup(struct vnode *start_dvp, int lockparent, char *dirname,
 		cnp.cn_flags |= LOCKPARENT;
 	cnp.cn_thread = td;
 	cnp.cn_cred = td->td_ucred;
-	cnp.cn_pnbuf = uma_zalloc(namei_zone, M_WAITOK);
+	cnp.cn_pnbuf = uma_zalloc(namei_zone, 0);
 	cnp.cn_nameptr = cnp.cn_pnbuf;
 	error = copystr(dirname, cnp.cn_pnbuf, MAXPATHLEN,
 	    (size_t *) &cnp.cn_namelen);
@@ -383,7 +383,7 @@ ufs_extattr_iterate_directory(struct ufsmount *ump, struct vnode *dvp,
 	if (dvp->v_type != VDIR)
 		return (ENOTDIR);
 
-	MALLOC(dirbuf, char *, DIRBLKSIZ, M_TEMP, M_WAITOK);
+	MALLOC(dirbuf, char *, DIRBLKSIZ, M_TEMP, 0);
 
 	auio.uio_iov = &aiov;
 	auio.uio_iovcnt = 1;
@@ -594,7 +594,7 @@ ufs_extattr_enable(struct ufsmount *ump, int attrnamespace,
 		return (EINVAL);
 
 	MALLOC(attribute, struct ufs_extattr_list_entry *,
-	    sizeof(struct ufs_extattr_list_entry), M_UFS_EXTATTR, M_WAITOK);
+	    sizeof(struct ufs_extattr_list_entry), M_UFS_EXTATTR, 0);
 	if (attribute == NULL)
 		return (ENOMEM);
 
diff --git a/sys/ufs/ufs/ufs_quota.c b/sys/ufs/ufs/ufs_quota.c
index 2582412..683c6bd 100644
--- a/sys/ufs/ufs/ufs_quota.c
+++ b/sys/ufs/ufs/ufs_quota.c
@@ -822,7 +822,7 @@ dqget(vp, id, ump, type, dqp)
 		desireddquot += DQUOTINC;
 	if (numdquot < desireddquot) {
 		dq = (struct dquot *)malloc(sizeof *dq, M_DQUOT,
-		    M_WAITOK | M_ZERO);
+		    M_ZERO);
 		numdquot++;
 	} else {
 		if ((dq = TAILQ_FIRST(&dqfreelist)) == NULL) {
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index af65b36..de56eec 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -368,7 +368,7 @@ ufs_access(ap)
 
 #ifdef UFS_ACL
 	if ((vp->v_mount->mnt_flag & MNT_ACLS) != 0) {
-		MALLOC(acl, struct acl *, sizeof(*acl), M_ACL, M_WAITOK);
+		MALLOC(acl, struct acl *, sizeof(*acl), M_ACL, 0);
 		len = sizeof(*acl);
 		error = VOP_GETACL(vp, ACL_TYPE_ACCESS, acl, ap->a_cred,
 		    ap->a_td);
@@ -1442,8 +1442,8 @@ ufs_mkdir(ap)
 #ifdef UFS_ACL
 	acl = dacl = NULL;
 	if ((dvp->v_mount->mnt_flag & MNT_ACLS) != 0) {
-		MALLOC(acl, struct acl *, sizeof(*acl), M_ACL, M_WAITOK);
-		MALLOC(dacl, struct acl *, sizeof(*dacl), M_ACL, M_WAITOK);
+		MALLOC(acl, struct acl *, sizeof(*acl), M_ACL, 0);
+		MALLOC(dacl, struct acl *, sizeof(*dacl), M_ACL, 0);
 
 		/*
 		 * Retrieve default ACL from parent, if any.
@@ -1845,7 +1845,7 @@ ufs_readdir(ap)
 			auio.uio_iovcnt = 1;
 			auio.uio_segflg = UIO_SYSSPACE;
 			aiov.iov_len = count;
-			MALLOC(dirbuf, caddr_t, count, M_TEMP, M_WAITOK);
+			MALLOC(dirbuf, caddr_t, count, M_TEMP, 0);
 			aiov.iov_base = dirbuf;
 			error = VOP_READ(ap->a_vp, &auio, 0, ap->a_cred);
 			if (error == 0) {
@@ -1889,7 +1889,7 @@ ufs_readdir(ap)
 		     dp = (struct dirent *)((caddr_t) dp + dp->d_reclen))
 			ncookies++;
 		MALLOC(cookies, u_long *, ncookies * sizeof(u_long), M_TEMP,
-		    M_WAITOK);
+		    0);
 		for (dp = dpStart, cookiep = cookies;
 		     dp < dpEnd;
 		     dp = (struct dirent *)((caddr_t) dp + dp->d_reclen)) {
@@ -2422,7 +2422,7 @@ ufs_makeinode(mode, dvp, vpp, cnp)
 #ifdef UFS_ACL
 	acl = NULL;
 	if ((dvp->v_mount->mnt_flag & MNT_ACLS) != 0) {
-		MALLOC(acl, struct acl *, sizeof(*acl), M_ACL, M_WAITOK);
+		MALLOC(acl, struct acl *, sizeof(*acl), M_ACL, 0);
 
 		/*
 		 * Retrieve default ACL for parent, if any.