Index: share/man/man9/malloc.9
===================================================================
RCS file: /home/ncvs/src/share/man/man9/malloc.9,v
retrieving revision 1.42
diff -u -p -r1.42 malloc.9
--- share/man/man9/malloc.9	22 Feb 2005 17:20:20 -0000	1.42
+++ share/man/man9/malloc.9	20 Mar 2008 09:57:51 -0000
@@ -247,7 +247,7 @@ with the
 flags
 .Dv M_DONTWAIT
 and
-.Dv M_TRYWAIT .
+.Dv M_WAIT .
 .Sh CONTEXT
 .Fn malloc ,
 .Fn realloc
Index: share/man/man9/mbchain.9
===================================================================
RCS file: /home/ncvs/src/share/man/man9/mbchain.9,v
retrieving revision 1.6
diff -u -p -r1.6 mbchain.9
--- share/man/man9/mbchain.9	28 Jan 2005 10:48:52 -0000	1.6
+++ share/man/man9/mbchain.9	20 Mar 2008 09:57:27 -0000
@@ -210,7 +210,7 @@ struct mbuf *m;
 mb_init(mbp);
 mb_put_uint8(mbp, 33);
 mb_put_uint16le(mbp, length);
-m = m_copym(mbp->mb_top, 0, M_COPYALL, M_TRYWAIT);
+m = m_copym(mbp->mb_top, 0, M_COPYALL, M_WAIT);
 send(m);
 mb_done(mbp);
 .Ed
Index: share/man/man9/mbuf.9
===================================================================
RCS file: /home/ncvs/src/share/man/man9/mbuf.9,v
retrieving revision 1.66
diff -u -p -r1.66 mbuf.9
--- share/man/man9/mbuf.9	1 Feb 2008 19:36:21 -0000	1.66
+++ share/man/man9/mbuf.9	20 Mar 2008 10:01:29 -0000
@@ -356,20 +356,10 @@ on failure.
 The
 .Fa how
 argument is to be set to
-.Dv M_TRYWAIT
+.Dv M_WAIT
 or
 .Dv M_DONTWAIT .
 It specifies whether the caller is willing to block if necessary.
-If
-.Fa how
-is set to
-.Dv M_TRYWAIT ,
-a failed allocation will result in the caller being put
-to sleep for a designated
-kern.ipc.mbuf_wait
-.Xr ( sysctl 8
-tunable)
-number of ticks.
 A number of other functions and macros related to
 .Vt mbufs
 have the same argument because they may
@@ -922,7 +912,7 @@ Upon success, the original chain will be
 chain will be returned.
 .Fa how
 should be either
-.Dv M_TRYWAIT
+.Dv M_WAIT
 or
 .Dv M_DONTWAIT ,
 depending on the caller's preference.
@@ -940,7 +930,7 @@ The original mbuf chain is always reclai
 count of any shared mbuf clusters is decremented.
 .Fa how
 should be either
-.Dv M_TRYWAIT
+.Dv M_WAIT
 or
 .Dv M_DONTWAIT ,
 depending on the caller's preference.
Index: sys/dev/en/midway.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/en/midway.c,v
retrieving revision 1.73
diff -u -p -r1.73 midway.c
--- sys/dev/en/midway.c	29 May 2007 11:28:27 -0000	1.73
+++ sys/dev/en/midway.c	20 Mar 2008 09:32:20 -0000
@@ -835,27 +835,15 @@ copy_mbuf(struct mbuf *m)
 {
 	struct mbuf *new;
 
-	MGET(new, M_TRYWAIT, MT_DATA);
-	if (new == NULL)
-		return (NULL);
+	MGET(new, M_WAIT, MT_DATA);
 
 	if (m->m_flags & M_PKTHDR) {
 		M_MOVE_PKTHDR(new, m);
-		if (m->m_len > MHLEN) {
-			MCLGET(new, M_TRYWAIT);
-			if ((m->m_flags & M_EXT) == 0) {
-				m_free(new);
-				return (NULL);
-			}
-		}
+		if (m->m_len > MHLEN)
+			MCLGET(new, M_WAIT);
 	} else {
-		if (m->m_len > MLEN) {
-			MCLGET(new, M_TRYWAIT);
-			if ((m->m_flags & M_EXT) == 0) {
-				m_free(new);
-				return (NULL);
-			}
-		}
+		if (m->m_len > MLEN)
+			MCLGET(new, M_WAIT);
 	}
 
 	bcopy(m->m_data, new->m_data, m->m_len);
@@ -2932,9 +2920,7 @@ en_attach(struct en_softc *sc)
 	    &en_utopia_methods);
 	utopia_init_media(&sc->utopia);
 
-	MGET(sc->padbuf, M_TRYWAIT, MT_DATA);
-	if (sc->padbuf == NULL)
-		goto fail;
+	MGET(sc->padbuf, M_WAIT, MT_DATA);
 	bzero(sc->padbuf->m_data, MLEN);
 
 	if (bus_dma_tag_create(NULL, 1, 0,
Index: sys/dev/fatm/if_fatm.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/fatm/if_fatm.c,v
retrieving revision 1.23
diff -u -p -r1.23 if_fatm.c
--- sys/dev/fatm/if_fatm.c	23 Feb 2007 12:18:40 -0000	1.23
+++ sys/dev/fatm/if_fatm.c	20 Mar 2008 09:32:40 -0000
@@ -1776,21 +1776,11 @@ copy_mbuf(struct mbuf *m)
 
 	if (m->m_flags & M_PKTHDR) {
 		M_MOVE_PKTHDR(new, m);
-		if (m->m_len > MHLEN) {
-			MCLGET(new, M_TRYWAIT);
-			if ((m->m_flags & M_EXT) == 0) {
-				m_free(new);
-				return (NULL);
-			}
-		}
+		if (m->m_len > MHLEN)
+			MCLGET(new, M_WAIT);
 	} else {
-		if (m->m_len > MLEN) {
-			MCLGET(new, M_TRYWAIT);
-			if ((m->m_flags & M_EXT) == 0) {
-				m_free(new);
-				return (NULL);
-			}
-		}
+		if (m->m_len > MLEN)
+			MCLGET(new, M_WAIT);
 	}
 
 	bcopy(m->m_data, new->m_data, m->m_len);
Index: sys/dev/firewire/if_fwe.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/firewire/if_fwe.c,v
retrieving revision 1.44
diff -u -p -r1.44 if_fwe.c
--- sys/dev/firewire/if_fwe.c	6 Jun 2007 14:31:36 -0000	1.44
+++ sys/dev/firewire/if_fwe.c	20 Mar 2008 09:33:19 -0000
@@ -357,19 +357,11 @@ fwe_init(void *arg)
 		STAILQ_INIT(&xferq->stdma);
 		xferq->stproc = NULL;
 		for (i = 0; i < xferq->bnchunk; i ++) {
-			m =
-#if defined(__DragonFly__) || __FreeBSD_version < 500000
-				m_getcl(M_WAIT, MT_DATA, M_PKTHDR);
-#else
-				m_getcl(M_TRYWAIT, MT_DATA, M_PKTHDR);
-#endif
+			m = m_getcl(M_WAIT, MT_DATA, M_PKTHDR);
 			xferq->bulkxfer[i].mbuf = m;
-			if (m != NULL) {
-				m->m_len = m->m_pkthdr.len = m->m_ext.ext_size;
-				STAILQ_INSERT_TAIL(&xferq->stfree,
-						&xferq->bulkxfer[i], link);
-			} else
-				printf("%s: m_getcl failed\n", __FUNCTION__);
+			m->m_len = m->m_pkthdr.len = m->m_ext.ext_size;
+			STAILQ_INSERT_TAIL(&xferq->stfree,
+					&xferq->bulkxfer[i], link);
 		}
 		STAILQ_INIT(&fwe->xferlist);
 		for (i = 0; i < TX_MAX_QUEUE; i++) {
Index: sys/dev/firewire/if_fwip.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/firewire/if_fwip.c,v
retrieving revision 1.16
diff -u -p -r1.16 if_fwip.c
--- sys/dev/firewire/if_fwip.c	6 Jun 2007 14:31:36 -0000	1.16
+++ sys/dev/firewire/if_fwip.c	20 Mar 2008 09:33:53 -0000
@@ -332,19 +332,11 @@ fwip_init(void *arg)
 		STAILQ_INIT(&xferq->stdma);
 		xferq->stproc = NULL;
 		for (i = 0; i < xferq->bnchunk; i ++) {
-			m =
-#if defined(__DragonFly__) || __FreeBSD_version < 500000
-				m_getcl(M_WAIT, MT_DATA, M_PKTHDR);
-#else
-				m_getcl(M_TRYWAIT, MT_DATA, M_PKTHDR);
-#endif
+			m = m_getcl(M_WAIT, MT_DATA, M_PKTHDR);
 			xferq->bulkxfer[i].mbuf = m;
-			if (m != NULL) {
-				m->m_len = m->m_pkthdr.len = m->m_ext.ext_size;
-				STAILQ_INSERT_TAIL(&xferq->stfree,
-						&xferq->bulkxfer[i], link);
-			} else
-				printf("fwip_as_input: m_getcl failed\n");
+			m->m_len = m->m_pkthdr.len = m->m_ext.ext_size;
+			STAILQ_INSERT_TAIL(&xferq->stfree,
+					&xferq->bulkxfer[i], link);
 		}
 
 		fwip->fwb.start = INET_FIFO;
@@ -356,7 +348,7 @@ fwip_init(void *arg)
 			xfer = fw_xfer_alloc(M_FWIP);
 			if (xfer == NULL)
 				break;
-			m = m_getcl(M_TRYWAIT, MT_DATA, M_PKTHDR);
+			m = m_getcl(M_WAIT, MT_DATA, M_PKTHDR);
 			xfer->recv.payload = mtod(m, uint32_t *);
 			xfer->recv.pay_len = MCLBYTES;
 			xfer->hand = fwip_unicast_input;
@@ -876,7 +868,7 @@ fwip_unicast_input_recycle(struct fwip_s
 	 * We have finished with a unicast xfer. Allocate a new
 	 * cluster and stick it on the back of the input queue.
 	 */
-	m = m_getcl(M_TRYWAIT, MT_DATA, M_PKTHDR);
+	m = m_getcl(M_WAIT, MT_DATA, M_PKTHDR);
 	xfer->mbuf = m;
 	xfer->recv.payload = mtod(m, uint32_t *);
 	xfer->recv.pay_len = MCLBYTES;
Index: sys/dev/iscsi/initiator/isc_soc.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/iscsi/initiator/isc_soc.c,v
retrieving revision 1.3
diff -u -p -r1.3 isc_soc.c
--- sys/dev/iscsi/initiator/isc_soc.c	1 Feb 2008 19:36:23 -0000	1.3
+++ sys/dev/iscsi/initiator/isc_soc.c	20 Mar 2008 09:10:44 -0000
@@ -100,7 +100,7 @@ isc_sendPDU(isc_session_t *sp, pduq_t *p
      iv++;
 #else /* USE_MBUF */
      /*  mbuf for the iSCSI header */
-     MGETHDR(mh, M_TRYWAIT, MT_DATA);
+     MGETHDR(mh, M_WAIT, MT_DATA);
      mh->m_len = mh->m_pkthdr.len = sizeof(union ipdu_u);
      mh->m_pkthdr.rcvif = NULL;
      MH_ALIGN(mh, sizeof(union ipdu_u));
@@ -160,7 +160,7 @@ isc_sendPDU(isc_session_t *sp, pduq_t *p
           while (len > 0) {
                 int       l;
           
-                MGET(md, M_TRYWAIT, MT_DATA);
+                MGET(md, M_WAIT, MT_DATA);
 		md->m_ext.ref_cnt = &nil_refcnt;
                 l = min(MCLBYTES, len);
                 MEXTADD(md, pp->ds + off, l, nil_fn,
@@ -187,7 +187,7 @@ isc_sendPDU(isc_session_t *sp, pduq_t *p
 	  iv->iov_len	= sizeof(int);
 	  iv++;
 #else /* USE_MBUF */
-          MGET(me, M_TRYWAIT, MT_DATA);
+          MGET(me, M_WAIT, MT_DATA);
           me->m_len = sizeof(int);
           MH_ALIGN(mh, sizeof(int));
           bcopy(&pp->ds_dig, me->m_data, sizeof(int));
Index: sys/kern/subr_mchain.c
===================================================================
RCS file: /home/ncvs/src/sys/kern/subr_mchain.c,v
retrieving revision 1.18
diff -u -p -r1.18 subr_mchain.c
--- sys/kern/subr_mchain.c	29 Jul 2005 13:22:36 -0000	1.18
+++ sys/kern/subr_mchain.c	20 Mar 2008 09:36:46 -0000
@@ -56,9 +56,7 @@ mb_init(struct mbchain *mbp)
 {
 	struct mbuf *m;
 
-	m = m_gethdr(M_TRYWAIT, MT_DATA);
-	if (m == NULL) 
-		return ENOBUFS;
+	m = m_gethdr(M_WAIT, MT_DATA);
 	m->m_len = 0;
 	mb_initm(mbp, m);
 	return 0;
@@ -113,9 +111,7 @@ mb_reserve(struct mbchain *mbp, int size
 		panic("mb_reserve: size = %d\n", size);
 	m = mbp->mb_cur;
 	if (mbp->mb_mleft < size) {
-		mn = m_get(M_TRYWAIT, MT_DATA);
-		if (mn == NULL)
-			return NULL;
+		mn = m_get(M_WAIT, MT_DATA);
 		mbp->mb_cur = m->m_next = mn;
 		m = mn;
 		m->m_len = 0;
@@ -190,11 +186,9 @@ mb_put_mem(struct mbchain *mbp, c_caddr_
 
 	while (size > 0) {
 		if (mleft == 0) {
-			if (m->m_next == NULL) {
-				m = m_getm(m, size, M_TRYWAIT, MT_DATA);
-				if (m == NULL)
-					return ENOBUFS;
-			} else
+			if (m->m_next == NULL)
+				m = m_getm(m, size, M_WAIT, MT_DATA);
+			else
 				m = m->m_next;
 			mleft = M_TRAILINGSPACE(m);
 			continue;
@@ -295,9 +289,7 @@ md_init(struct mdchain *mdp)
 {
 	struct mbuf *m;
 
-	m = m_gethdr(M_TRYWAIT, MT_DATA);
-	if (m == NULL) 
-		return ENOBUFS;
+	m = m_gethdr(M_WAIT, MT_DATA);
 	m->m_len = 0;
 	md_initm(mdp, m);
 	return 0;
@@ -503,9 +495,7 @@ md_get_mbuf(struct mdchain *mdp, int siz
 {
 	struct mbuf *m = mdp->md_cur, *rm;
 
-	rm = m_copym(m, mdp->md_pos - mtod(m, u_char*), size, M_TRYWAIT);
-	if (rm == NULL)
-		return EBADRPC;
+	rm = m_copym(m, mdp->md_pos - mtod(m, u_char*), size, M_WAIT);
 	md_get_mem(mdp, NULL, size, MB_MZERO);
 	*ret = rm;
 	return 0;
Index: sys/kern/uipc_mbuf.c
===================================================================
RCS file: /home/ncvs/src/sys/kern/uipc_mbuf.c,v
retrieving revision 1.176
diff -u -p -r1.176 uipc_mbuf.c
--- sys/kern/uipc_mbuf.c	1 Feb 2008 19:36:25 -0000	1.176
+++ sys/kern/uipc_mbuf.c	20 Mar 2008 09:13:16 -0000
@@ -519,7 +519,7 @@ m_prepend(struct mbuf *m, int len, int h
 /*
  * Make a copy of an mbuf chain starting "off0" bytes from the beginning,
  * continuing for "len" bytes.  If len is M_COPYALL, copy to end of mbuf.
- * The wait parameter is a choice of M_TRYWAIT/M_DONTWAIT from caller.
+ * The wait parameter is a choice of M_WAIT/M_DONTWAIT from caller.
  * Note that the copy is read-only, because clusters are not copied,
  * only their reference counts are incremented.
  */
Index: sys/kern/uipc_socket.c
===================================================================
RCS file: /home/ncvs/src/sys/kern/uipc_socket.c,v
retrieving revision 1.307
diff -u -p -r1.307 uipc_socket.c
--- sys/kern/uipc_socket.c	19 Mar 2008 09:58:25 -0000	1.307
+++ sys/kern/uipc_socket.c	20 Mar 2008 09:38:15 -0000
@@ -860,16 +860,16 @@ sosend_copyin(struct uio *uio, struct mb
 			}
 #else /* ZERO_COPY_SOCKETS */
 			if (top == NULL) {
-				m = m_getcl(M_TRYWAIT, MT_DATA, M_PKTHDR);
+				m = m_getcl(M_WAIT, MT_DATA, M_PKTHDR);
 				m->m_pkthdr.len = 0;
 				m->m_pkthdr.rcvif = NULL;
 			} else
-				m = m_getcl(M_TRYWAIT, MT_DATA, 0);
+				m = m_getcl(M_WAIT, MT_DATA, 0);
 			len = min(min(MCLBYTES, resid), *space);
 #endif /* ZERO_COPY_SOCKETS */
 		} else {
 			if (top == NULL) {
-				m = m_gethdr(M_TRYWAIT, MT_DATA);
+				m = m_gethdr(M_WAIT, MT_DATA);
 				m->m_pkthdr.len = 0;
 				m->m_pkthdr.rcvif = NULL;
 
@@ -881,7 +881,7 @@ sosend_copyin(struct uio *uio, struct mb
 				if (atomic && m && len < MHLEN)
 					MH_ALIGN(m, len);
 			} else {
-				m = m_get(M_TRYWAIT, MT_DATA);
+				m = m_get(M_WAIT, MT_DATA);
 				len = min(min(MLEN, resid), *space);
 			}
 		}
@@ -1304,9 +1304,7 @@ soreceive_rcvoob(struct socket *so, stru
 
 	KASSERT(flags & MSG_OOB, ("soreceive_rcvoob: (flags & MSG_OOB) == 0"));
 
-	m = m_get(M_TRYWAIT, MT_DATA);
-	if (m == NULL)
-		return (ENOBUFS);
+	m = m_get(M_WAIT, MT_DATA);
 	error = (*pr->pr_usrreqs->pru_rcvoob)(so, m, flags & MSG_PEEK);
 	if (error)
 		goto bad;
@@ -1718,11 +1716,11 @@ dontblock:
 					if (flags & MSG_DONTWAIT)
 						copy_flag = M_DONTWAIT;
 					else
-						copy_flag = M_TRYWAIT;
-					if (copy_flag == M_TRYWAIT)
+						copy_flag = M_WAIT;
+					if (copy_flag == M_WAIT)
 						SOCKBUF_UNLOCK(&so->so_rcv);
 					*mp = m_copym(m, 0, len, copy_flag);
-					if (copy_flag == M_TRYWAIT)
+					if (copy_flag == M_WAIT)
 						SOCKBUF_LOCK(&so->so_rcv);
  					if (*mp == NULL) {
  						/*
@@ -2333,11 +2331,11 @@ soopt_getm(struct sockopt *sopt, struct 
 	struct mbuf *m, *m_prev;
 	int sopt_size = sopt->sopt_valsize;
 
-	MGET(m, sopt->sopt_td ? M_TRYWAIT : M_DONTWAIT, MT_DATA);
+	MGET(m, sopt->sopt_td ? M_WAIT : M_DONTWAIT, MT_DATA);
 	if (m == NULL)
 		return ENOBUFS;
 	if (sopt_size > MLEN) {
-		MCLGET(m, sopt->sopt_td ? M_TRYWAIT : M_DONTWAIT);
+		MCLGET(m, sopt->sopt_td ? M_WAIT : M_DONTWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			m_free(m);
 			return ENOBUFS;
@@ -2351,13 +2349,13 @@ soopt_getm(struct sockopt *sopt, struct 
 	m_prev = m;
 
 	while (sopt_size) {
-		MGET(m, sopt->sopt_td ? M_TRYWAIT : M_DONTWAIT, MT_DATA);
+		MGET(m, sopt->sopt_td ? M_WAIT : M_DONTWAIT, MT_DATA);
 		if (m == NULL) {
 			m_freem(*mp);
 			return ENOBUFS;
 		}
 		if (sopt_size > MLEN) {
-			MCLGET(m, sopt->sopt_td != NULL ? M_TRYWAIT :
+			MCLGET(m, sopt->sopt_td != NULL ? M_WAIT :
 			    M_DONTWAIT);
 			if ((m->m_flags & M_EXT) == 0) {
 				m_freem(m);
Index: sys/kern/uipc_syscalls.c
===================================================================
RCS file: /home/ncvs/src/sys/kern/uipc_syscalls.c,v
retrieving revision 1.269
diff -u -p -r1.269 uipc_syscalls.c
--- sys/kern/uipc_syscalls.c	24 Feb 2008 00:07:00 -0000	1.269
+++ sys/kern/uipc_syscalls.c	20 Mar 2008 09:39:13 -0000
@@ -705,16 +705,11 @@ sendit(td, s, mp, flags)
 		if (mp->msg_flags == MSG_COMPAT) {
 			struct cmsghdr *cm;
 
-			M_PREPEND(control, sizeof(*cm), M_TRYWAIT);
-			if (control == 0) {
-				error = ENOBUFS;
-				goto bad;
-			} else {
-				cm = mtod(control, struct cmsghdr *);
-				cm->cmsg_len = control->m_len;
-				cm->cmsg_level = SOL_SOCKET;
-				cm->cmsg_type = SCM_RIGHTS;
-			}
+			M_PREPEND(control, sizeof(*cm), M_WAIT);
+			cm = mtod(control, struct cmsghdr *);
+			cm->cmsg_len = control->m_len;
+			cm->cmsg_level = SOL_SOCKET;
+			cm->cmsg_type = SCM_RIGHTS;
 		}
 #endif
 	} else {
@@ -1627,16 +1622,9 @@ sockargs(mp, buf, buflen, type)
 			if ((u_int)buflen > MCLBYTES)
 				return (EINVAL);
 	}
-	m = m_get(M_TRYWAIT, type);
-	if (m == NULL)
-		return (ENOBUFS);
-	if ((u_int)buflen > MLEN) {
-		MCLGET(m, M_TRYWAIT);
-		if ((m->m_flags & M_EXT) == 0) {
-			m_free(m);
-			return (ENOBUFS);
-		}
-	}
+	m = m_get(M_WAIT, type);
+	if ((u_int)buflen > MLEN)
+		MCLGET(m, M_WAIT);
 	m->m_len = buflen;
 	error = copyin(buf, mtod(m, caddr_t), (u_int)buflen);
 	if (error)
Index: sys/net/bpf.c
===================================================================
RCS file: /home/ncvs/src/sys/net/bpf.c,v
retrieving revision 1.187
diff -u -p -r1.187 bpf.c
--- sys/net/bpf.c	16 Mar 2008 10:58:06 -0000	1.187
+++ sys/net/bpf.c	20 Mar 2008 09:43:04 -0000
@@ -249,13 +249,10 @@ bpf_movein(struct uio *uio, int linktype
 	if ((unsigned)len > MCLBYTES)
 		return (EIO);
 
-	if (len > MHLEN) {
-		m = m_getcl(M_TRYWAIT, MT_DATA, M_PKTHDR);
-	} else {
-		MGETHDR(m, M_TRYWAIT, MT_DATA);
-	}
-	if (m == NULL)
-		return (ENOBUFS);
+	if (len > MHLEN)
+		m = m_getcl(M_WAIT, MT_DATA, M_PKTHDR);
+	else
+		MGETHDR(m, M_WAIT, MT_DATA);
 	m->m_pkthdr.len = m->m_len = len;
 	m->m_pkthdr.rcvif = NULL;
 	*mp = m;
Index: sys/net/if_ef.c
===================================================================
RCS file: /home/ncvs/src/sys/net/if_ef.c,v
retrieving revision 1.39
diff -u -p -r1.39 if_ef.c
--- sys/net/if_ef.c	18 Jan 2006 14:24:39 -0000	1.39
+++ sys/net/if_ef.c	20 Mar 2008 09:43:36 -0000
@@ -415,11 +415,7 @@ ef_output(struct ifnet *ifp, struct mbuf
 		type = htons(m->m_pkthdr.len);
 		break;
 	    case ETHER_FT_8022:
-		M_PREPEND(m, ETHER_HDR_LEN + 3, M_TRYWAIT);
-		if (m == NULL) {
-			*mp = NULL;
-			return ENOBUFS;
-		}
+		M_PREPEND(m, ETHER_HDR_LEN + 3, M_WAIT);
 		/*
 		 * Ensure that ethernet header and next three bytes
 		 * will fit into single mbuf
@@ -438,11 +434,7 @@ ef_output(struct ifnet *ifp, struct mbuf
 		*hlen += 3;
 		break;
 	    case ETHER_FT_SNAP:
-		M_PREPEND(m, 8, M_TRYWAIT);
-		if (m == NULL) {
-			*mp = NULL;
-			return ENOBUFS;
-		}
+		M_PREPEND(m, 8, M_WAIT);
 		type = htons(m->m_pkthdr.len);
 		cp = mtod(m, u_char *);
 		bcopy("\xAA\xAA\x03\x00\x00\x00\x81\x37", cp, 8);
Index: sys/net/if_fddisubr.c
===================================================================
RCS file: /home/ncvs/src/sys/net/if_fddisubr.c,v
retrieving revision 1.105
diff -u -p -r1.105 if_fddisubr.c
--- sys/net/if_fddisubr.c	24 Oct 2007 19:03:57 -0000	1.105
+++ sys/net/if_fddisubr.c	20 Mar 2008 09:43:48 -0000
@@ -204,9 +204,7 @@ fddi_output(ifp, m, dst, rt0)
 	    if (aa->aa_flags & AFA_PHASE2) {
 		struct llc llc;
 
-		M_PREPEND(m, LLC_SNAPFRAMELEN, M_TRYWAIT);
-		if (m == 0)
-			senderr(ENOBUFS);
+		M_PREPEND(m, LLC_SNAPFRAMELEN, M_WAIT);
 		llc.llc_dsap = llc.llc_ssap = LLC_SNAP_LSAP;
 		llc.llc_control = LLC_UI;
 		bcopy(at_org_code, llc.llc_snap.org_code, sizeof(at_org_code));
Index: sys/net/if_iso88025subr.c
===================================================================
RCS file: /home/ncvs/src/sys/net/if_iso88025subr.c,v
retrieving revision 1.76
diff -u -p -r1.76 if_iso88025subr.c
--- sys/net/if_iso88025subr.c	24 Oct 2007 19:03:57 -0000	1.76
+++ sys/net/if_iso88025subr.c	20 Mar 2008 09:43:57 -0000
@@ -336,9 +336,7 @@ iso88025_output(ifp, m, dst, rt0)
 		bcopy((caddr_t)&(satoipx_addr(dst).x_host), (caddr_t)edst,
 		      ISO88025_ADDR_LEN);
 
-		M_PREPEND(m, 3, M_TRYWAIT);
-		if (m == 0)
-			senderr(ENOBUFS);
+		M_PREPEND(m, 3, M_WAIT);
 		m = m_pullup(m, 3);
 		if (m == 0)
 			senderr(ENOBUFS);
Index: sys/net/if_sl.c
===================================================================
RCS file: /home/ncvs/src/sys/net/if_sl.c,v
retrieving revision 1.133
diff -u -p -r1.133 if_sl.c
--- sys/net/if_sl.c	6 Nov 2006 13:42:02 -0000	1.133
+++ sys/net/if_sl.c	20 Mar 2008 09:44:30 -0000
@@ -298,20 +298,8 @@ slcreate(void)
 		return (NULL);
 	}
 
-	m = m_gethdr(M_TRYWAIT, MT_DATA);
-	if (m != NULL) {
-		MCLGET(m, M_TRYWAIT);
-		if ((m->m_flags & M_EXT) == 0) {
-			m_free(m);
-			m = NULL;
-		}
-	}
-
-	if (m == NULL) {
-		printf("sl: can't allocate buffer\n");
-		free(sc, M_SL);
-		return (NULL);
-	}
+	m = m_gethdr(M_WAIT, MT_DATA);
+	MCLGET(m, M_WAIT);
 
 	sc->sc_ep = mtod(m, u_char *) + SLBUFSIZE;
 	sc->sc_mbuf = m;
Index: sys/net/raw_cb.c
===================================================================
RCS file: /home/ncvs/src/sys/net/raw_cb.c,v
retrieving revision 1.34
diff -u -p -r1.34 raw_cb.c
--- sys/net/raw_cb.c	2 Jun 2006 08:27:15 -0000	1.34
+++ sys/net/raw_cb.c	20 Mar 2008 09:17:22 -0000
@@ -141,7 +141,7 @@ raw_bind(so, nam)
 	if (ifnet == 0)
 		return (EADDRNOTAVAIL);
 	rp = sotorawcb(so);
-	nam = m_copym(nam, 0, M_COPYALL, M_TRYWAIT);
+	nam = m_copym(nam, 0, M_COPYALL, M_WAIT);
 	rp->rcb_laddr = mtod(nam, struct sockaddr *);
 	return (0);
 }
Index: sys/netatalk/aarp.c
===================================================================
RCS file: /home/ncvs/src/sys/netatalk/aarp.c,v
retrieving revision 1.45
diff -u -p -r1.45 aarp.c
--- sys/netatalk/aarp.c	20 Nov 2007 18:35:57 -0000	1.45
+++ sys/netatalk/aarp.c	20 Mar 2008 09:44:58 -0000
@@ -633,9 +633,7 @@ aarpprobe(void *arg)
 		    sizeof(eh->ether_dhost));
 		eh->ether_type = htons(sizeof(struct llc) +
 		    sizeof(struct ether_aarp));
-		M_PREPEND(m, sizeof(struct llc), M_TRYWAIT);
-		if (m == NULL)
-			return;
+		M_PREPEND(m, sizeof(struct llc), M_WAIT);
 		llc = mtod(m, struct llc *);
 		llc->llc_dsap = llc->llc_ssap = LLC_SNAP_LSAP;
 		llc->llc_control = LLC_UI;
Index: sys/netatm/port.h
===================================================================
RCS file: /home/ncvs/src/sys/netatm/port.h,v
retrieving revision 1.16
diff -u -p -r1.16 port.h
--- sys/netatm/port.h	7 Jan 2005 01:45:36 -0000	1.16
+++ sys/netatm/port.h	20 Mar 2008 09:20:11 -0000
@@ -126,7 +126,7 @@
 #include <sys/mbuf.h>
 typedef struct mbuf	KBuffer;
 
-#define	KB_F_WAIT	M_TRYWAIT
+#define	KB_F_WAIT	M_WAIT
 #define	KB_F_NOWAIT	M_DONTWAIT
 
 #define	KB_T_HEADER	MT_HEADER
Index: sys/netinet/ip_output.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet/ip_output.c,v
retrieving revision 1.278
diff -u -p -r1.278 ip_output.c
--- sys/netinet/ip_output.c	2 Feb 2008 14:11:31 -0000	1.278
+++ sys/netinet/ip_output.c	20 Mar 2008 09:20:24 -0000
@@ -823,7 +823,7 @@ ip_ctloutput(struct socket *so, struct s
 				error = EMSGSIZE;
 				break;
 			}
-			MGET(m, sopt->sopt_td ? M_TRYWAIT : M_DONTWAIT, MT_DATA);
+			MGET(m, sopt->sopt_td ? M_WAIT : M_DONTWAIT, MT_DATA);
 			if (m == NULL) {
 				error = ENOBUFS;
 				break;
Index: sys/netinet6/ip6_output.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet6/ip6_output.c,v
retrieving revision 1.117
diff -u -p -r1.117 ip6_output.c
--- sys/netinet6/ip6_output.c	14 Mar 2008 16:38:11 -0000	1.117
+++ sys/netinet6/ip6_output.c	20 Mar 2008 09:20:34 -0000
@@ -2729,7 +2729,7 @@ ip6_getmoptions(int optname, struct ip6_
 {
 	u_int *hlim, *loop, *ifindex;
 
-	*mp = m_get(M_TRYWAIT, MT_HEADER);		/* XXX */
+	*mp = m_get(M_WAIT, MT_HEADER);		/* XXX */
 
 	switch (optname) {
 
Index: sys/netncp/ncp_sock.c
===================================================================
RCS file: /home/ncvs/src/sys/netncp/ncp_sock.c,v
retrieving revision 1.20
diff -u -p -r1.20 ncp_sock.c
--- sys/netncp/ncp_sock.c	16 Dec 2007 06:21:20 -0000	1.20
+++ sys/netncp/ncp_sock.c	20 Mar 2008 09:20:43 -0000
@@ -163,7 +163,7 @@ ncp_sock_send(struct socket *so, struct 
 	int error, flags=0;
 
 	for (;;) {
-		m = m_copym(top, 0, M_COPYALL, M_TRYWAIT);
+		m = m_copym(top, 0, M_COPYALL, M_WAIT);
 /*		NCPDDEBUG(m);*/
 		error = sosend(so, to, 0, m, 0, flags, td);
 		if (error == 0 || error == EINTR || error == ENETDOWN)
Index: sys/netsmb/smb_iod.c
===================================================================
RCS file: /home/ncvs/src/sys/netsmb/smb_iod.c,v
retrieving revision 1.19
diff -u -p -r1.19 smb_iod.c
--- sys/netsmb/smb_iod.c	25 Feb 2008 21:09:16 -0000	1.19
+++ sys/netsmb/smb_iod.c	20 Mar 2008 09:48:47 -0000
@@ -261,8 +261,8 @@ smb_iod_sendrq(struct smbiod *iod, struc
 	}
 	SMBSDEBUG("M:%04x, P:%04x, U:%04x, T:%04x\n", rqp->sr_mid, 0, 0, 0);
 	m_dumpm(rqp->sr_rq.mb_top);
-	m = m_copym(rqp->sr_rq.mb_top, 0, M_COPYALL, M_TRYWAIT);
-	error = rqp->sr_lerror = m ? SMB_TRAN_SEND(vcp, m, td) : ENOBUFS;
+	m = m_copym(rqp->sr_rq.mb_top, 0, M_COPYALL, M_WAIT);
+	error = rqp->sr_lerror = SMB_TRAN_SEND(vcp, m, td);
 	if (error == 0) {
 		getnanotime(&rqp->sr_timesent);
 		iod->iod_lastrqsent = rqp->sr_timesent;
Index: sys/netsmb/smb_rq.c
===================================================================
RCS file: /home/ncvs/src/sys/netsmb/smb_rq.c,v
retrieving revision 1.17
diff -u -p -r1.17 smb_rq.c
--- sys/netsmb/smb_rq.c	22 Aug 2006 03:05:51 -0000	1.17
+++ sys/netsmb/smb_rq.c	20 Mar 2008 09:49:04 -0000
@@ -433,9 +433,7 @@ smb_t2_placedata(struct mbuf *mtop, u_in
 	struct mbuf *m, *m0;
 	int len;
 
-	m0 = m_split(mtop, offset, M_TRYWAIT);
-	if (m0 == NULL)
-		return EBADRPC;
+	m0 = m_split(mtop, offset, M_WAIT);
 	len = m_length(m0, &m);
 	m->m_len -= len - count;
 	if (mdp->md_top == NULL) {
Index: sys/netsmb/smb_trantcp.c
===================================================================
RCS file: /home/ncvs/src/sys/netsmb/smb_trantcp.c,v
retrieving revision 1.27
diff -u -p -r1.27 smb_trantcp.c
--- sys/netsmb/smb_trantcp.c	16 Dec 2007 06:21:20 -0000	1.27
+++ sys/netsmb/smb_trantcp.c	20 Mar 2008 09:50:05 -0000
@@ -572,9 +572,7 @@ smb_nbst_send(struct smb_vc *vcp, struct
 		error = ENOTCONN;
 		goto abort;
 	}
-	M_PREPEND(m0, 4, M_TRYWAIT);
-	if (m0 == NULL)
-		return ENOBUFS;
+	M_PREPEND(m0, 4, M_WAIT);
 	nb_sethdr(m0, NB_SSN_MESSAGE, m_fixhdr(m0) - 4);
 	error = nb_sosend(nbp->nbp_tso, m0, 0, td);
 	return error;
Index: sys/nfs/nfs_common.c
===================================================================
RCS file: /home/ncvs/src/sys/nfs/nfs_common.c,v
retrieving revision 1.118
diff -u -p -r1.118 nfs_common.c
--- sys/nfs/nfs_common.c	14 Jul 2005 20:08:26 -0000	1.118
+++ sys/nfs/nfs_common.c	20 Mar 2008 09:21:08 -0000
@@ -263,7 +263,7 @@ nfsm_build_xx(int s, struct mbuf **mb, c
 	void *ret;
 
 	if (s > M_TRAILINGSPACE(*mb)) {
-		MGET(mb2, M_TRYWAIT, MT_DATA);
+		MGET(mb2, M_WAIT, MT_DATA);
 		if (s > MLEN)
 			panic("build > MLEN");
 		(*mb)->m_next = mb2;
@@ -280,7 +280,7 @@ nfsm_build_xx(int s, struct mbuf **mb, c
 void *
 nfsm_dissect_xx(int s, struct mbuf **md, caddr_t *dpos)
 {
-	return nfsm_dissect_xx_sub(s, md, dpos, M_TRYWAIT);
+	return nfsm_dissect_xx_sub(s, md, dpos, M_WAIT);
 }
 
 void *
Index: sys/nfsclient/krpc_subr.c
===================================================================
RCS file: /home/ncvs/src/sys/nfsclient/krpc_subr.c,v
retrieving revision 1.30
diff -u -p -r1.30 krpc_subr.c
--- sys/nfsclient/krpc_subr.c	6 Aug 2007 14:26:02 -0000	1.30
+++ sys/nfsclient/krpc_subr.c	20 Mar 2008 09:51:50 -0000
@@ -151,9 +151,7 @@ krpc_portmap(struct sockaddr_in *sin, u_
 		return 0;
 	}
 
-	m = m_get(M_TRYWAIT, MT_DATA);
-	if (m == NULL)
-		return ENOBUFS;
+	m = m_get(M_WAIT, MT_DATA);
 	sdata = mtod(m, struct sdata *);
 	m->m_len = sizeof(*sdata);
 
@@ -274,7 +272,7 @@ krpc_call(struct sockaddr_in *sa, u_int 
 	/*
 	 * Prepend RPC message header.
 	 */
-	mhead = m_gethdr(M_TRYWAIT, MT_DATA);
+	mhead = m_gethdr(M_WAIT, MT_DATA);
 	mhead->m_next = *data;
 	call = mtod(mhead, struct krpc_call *);
 	mhead->m_len = sizeof(*call);
@@ -308,11 +306,7 @@ krpc_call(struct sockaddr_in *sa, u_int 
 	timo = 0;
 	for (;;) {
 		/* Send RPC request (or re-send). */
-		m = m_copym(mhead, 0, M_COPYALL, M_TRYWAIT);
-		if (m == NULL) {
-			error = ENOBUFS;
-			goto out;
-		}
+		m = m_copym(mhead, 0, M_COPYALL, M_WAIT);
 		error = sosend(so, (struct sockaddr *)sa, NULL, m,
 			       NULL, 0, td);
 		if (error) {
@@ -462,14 +456,9 @@ xdr_string_encode(char *str, int len)
 	if (mlen > MCLBYTES)		/* If too big, we just can't do it. */
 		return (NULL);
 
-	m = m_get(M_TRYWAIT, MT_DATA);
-	if (mlen > MLEN) {
-		MCLGET(m, M_TRYWAIT);
-		if ((m->m_flags & M_EXT) == 0) {
-			(void) m_free(m);	/* There can be only one. */
-			return (NULL);
-		}
-	}
+	m = m_get(M_WAIT, MT_DATA);
+	if (mlen > MLEN)
+		MCLGET(m, M_WAIT);
 	xs = mtod(m, struct xdr_string *);
 	m->m_len = mlen;
 	xs->len = txdr_unsigned(len);
Index: sys/nfsclient/nfs_socket.c
===================================================================
RCS file: /home/ncvs/src/sys/nfsclient/nfs_socket.c,v
retrieving revision 1.158
diff -u -p -r1.158 nfs_socket.c
--- sys/nfsclient/nfs_socket.c	13 Feb 2008 00:04:58 -0000	1.158
+++ sys/nfsclient/nfs_socket.c	20 Mar 2008 09:22:11 -0000
@@ -1169,7 +1169,7 @@ nfs_request(struct vnode *vp, struct mbu
 	 * For stream protocols, insert a Sun RPC Record Mark.
 	 */
 	if (nmp->nm_sotype == SOCK_STREAM) {
-		M_PREPEND(m, NFSX_UNSIGNED, M_TRYWAIT);
+		M_PREPEND(m, NFSX_UNSIGNED, M_WAIT);
 		*mtod(m, u_int32_t *) = htonl(0x80000000 |
 			 (m->m_pkthdr.len - NFSX_UNSIGNED));
 	}
@@ -1213,7 +1213,7 @@ tryagain:
 		if (nmp->nm_sotype == SOCK_STREAM)
 			nmp->nm_nfstcpstate.sock_send_inprog++;
 		mtx_unlock(&nmp->nm_mtx);
-		m2 = m_copym(m, 0, M_COPYALL, M_TRYWAIT);
+		m2 = m_copym(m, 0, M_COPYALL, M_WAIT);
 		error = nfs_send(nmp->nm_so, nmp->nm_nam, m2, rep);
 		mtx_lock(&nmp->nm_mtx);
 		mtx_lock(&rep->r_mtx);
Index: sys/nfsclient/nfs_subs.c
===================================================================
RCS file: /home/ncvs/src/sys/nfsclient/nfs_subs.c,v
retrieving revision 1.153
diff -u -p -r1.153 nfs_subs.c
--- sys/nfsclient/nfs_subs.c	25 Feb 2008 18:45:57 -0000	1.153
+++ sys/nfsclient/nfs_subs.c	20 Mar 2008 09:22:58 -0000
@@ -165,9 +165,9 @@ nfsm_reqhead(struct vnode *vp, u_long pr
 {
 	struct mbuf *mb;
 
-	MGET(mb, M_TRYWAIT, MT_DATA);
+	MGET(mb, M_WAIT, MT_DATA);
 	if (hsiz >= MINCLSIZE)
-		MCLGET(mb, M_TRYWAIT);
+		MCLGET(mb, M_WAIT);
 	mb->m_len = 0;
 	return (mb);
 }
@@ -191,9 +191,9 @@ nfsm_rpchead(struct ucred *cr, int nmfla
 	int grpsiz, authsiz;
 
 	authsiz = nfsm_rndup(auth_len);
-	MGETHDR(mb, M_TRYWAIT, MT_DATA);
+	MGETHDR(mb, M_WAIT, MT_DATA);
 	if ((authsiz + 10 * NFSX_UNSIGNED) >= MINCLSIZE) {
-		MCLGET(mb, M_TRYWAIT);
+		MCLGET(mb, M_WAIT);
 	} else if ((authsiz + 10 * NFSX_UNSIGNED) < MHLEN) {
 		MH_ALIGN(mb, authsiz + 10 * NFSX_UNSIGNED);
 	} else {
@@ -286,9 +286,9 @@ nfsm_uiotombuf(struct uio *uiop, struct 
 		while (left > 0) {
 			mlen = M_TRAILINGSPACE(mp);
 			if (mlen == 0) {
-				MGET(mp, M_TRYWAIT, MT_DATA);
+				MGET(mp, M_WAIT, MT_DATA);
 				if (clflg)
-					MCLGET(mp, M_TRYWAIT);
+					MCLGET(mp, M_WAIT);
 				mp->m_len = 0;
 				mp2->m_next = mp;
 				mp2 = mp;
@@ -319,7 +319,7 @@ nfsm_uiotombuf(struct uio *uiop, struct 
 	}
 	if (rem > 0) {
 		if (rem > M_TRAILINGSPACE(mp)) {
-			MGET(mp, M_TRYWAIT, MT_DATA);
+			MGET(mp, M_WAIT, MT_DATA);
 			mp->m_len = 0;
 			mp2->m_next = mp;
 		}
@@ -364,9 +364,9 @@ nfsm_strtmbuf(struct mbuf **mb, char **b
 	}
 	/* Loop around adding mbufs */
 	while (siz > 0) {
-		MGET(m1, M_TRYWAIT, MT_DATA);
+		MGET(m1, M_WAIT, MT_DATA);
 		if (siz > MLEN)
-			MCLGET(m1, M_TRYWAIT);
+			MCLGET(m1, M_WAIT);
 		m1->m_len = NFSMSIZ(m1);
 		m2->m_next = m1;
 		m2 = m1;
@@ -563,7 +563,7 @@ nfs_loadattrcache(struct vnode **vpp, st
 
 	md = *mdp;
 	t1 = (mtod(md, caddr_t) + md->m_len) - *dposp;
-	cp2 = nfsm_disct(mdp, dposp, NFSX_FATTR(v3), t1, M_TRYWAIT);
+	cp2 = nfsm_disct(mdp, dposp, NFSX_FATTR(v3), t1, M_WAIT);
 	if (cp2 == NULL)
 		return EBADRPC;
 	fp = (struct nfs_fattr *)cp2;
Index: sys/nfsserver/nfs_serv.c
===================================================================
RCS file: /home/ncvs/src/sys/nfsserver/nfs_serv.c,v
retrieving revision 1.178
diff -u -p -r1.178 nfs_serv.c
--- sys/nfsserver/nfs_serv.c	4 Mar 2008 11:05:03 -0000	1.178
+++ sys/nfsserver/nfs_serv.c	20 Mar 2008 09:23:11 -0000
@@ -686,8 +686,8 @@ nfsrv_readlink(struct nfsrv_descript *nf
 	len = 0;
 	i = 0;
 	while (len < NFS_MAXPATHLEN) {
-		MGET(nmp, M_TRYWAIT, MT_DATA);
-		MCLGET(nmp, M_TRYWAIT);
+		MGET(nmp, M_WAIT, MT_DATA);
+		MCLGET(nmp, M_WAIT);
 		nmp->m_len = NFSMSIZ(nmp);
 		if (len == 0)
 			mp3 = mp = nmp;
@@ -935,8 +935,8 @@ nfsrv_read(struct nfsrv_descript *nfsd, 
 				i++;
 			}
 			if (left > 0) {
-				MGET(m, M_TRYWAIT, MT_DATA);
-				MCLGET(m, M_TRYWAIT);
+				MGET(m, M_WAIT, MT_DATA);
+				MCLGET(m, M_WAIT);
 				m->m_len = 0;
 				m2->m_next = m;
 				m2 = m;
Index: sys/nfsserver/nfs_srvcache.c
===================================================================
RCS file: /home/ncvs/src/sys/nfsserver/nfs_srvcache.c,v
retrieving revision 1.44
diff -u -p -r1.44 nfs_srvcache.c
--- sys/nfsserver/nfs_srvcache.c	17 Mar 2007 18:18:08 -0000	1.44
+++ sys/nfsserver/nfs_srvcache.c	20 Mar 2008 09:23:19 -0000
@@ -227,7 +227,7 @@ loop:
 				nfsrvstats.srvcache_nonidemdonehits++;
 				NFSD_UNLOCK();
 				*repp = m_copym(rp->rc_reply, 0, M_COPYALL,
-						M_TRYWAIT);
+						M_WAIT);
 				NFSD_LOCK();
 				ret = RC_REPLY;
 			} else {
@@ -348,7 +348,7 @@ loop:
 				} else {
 					NFSD_UNLOCK();
 					rp->rc_reply = m_copym(repmbuf,
-						0, M_COPYALL, M_TRYWAIT);
+						0, M_COPYALL, M_WAIT);
 					NFSD_LOCK();
 					rp->rc_flag |= RC_REPMBUF;
 				}
Index: sys/nfsserver/nfs_srvsock.c
===================================================================
RCS file: /home/ncvs/src/sys/nfsserver/nfs_srvsock.c,v
retrieving revision 1.107
diff -u -p -r1.107 nfs_srvsock.c
--- sys/nfsserver/nfs_srvsock.c	19 Mar 2008 12:33:25 -0000	1.107
+++ sys/nfsserver/nfs_srvsock.c	20 Mar 2008 09:23:41 -0000
@@ -148,7 +148,7 @@ nfs_rephead(int siz, struct nfsrv_descri
 	nd->nd_repstat = err;
 	if (err && (nd->nd_flag & ND_NFSV3) == 0)	/* XXX recheck */
 		siz = 0;
-	MGETHDR(mreq, M_TRYWAIT, MT_DATA);
+	MGETHDR(mreq, M_WAIT, MT_DATA);
 	mb = mreq;
 	/*
 	 * If this is a big reply, use a cluster else
@@ -157,7 +157,7 @@ nfs_rephead(int siz, struct nfsrv_descri
 	mreq->m_len = 6 * NFSX_UNSIGNED;
 	siz += RPC_REPLYSIZ;
 	if ((max_hdr + siz) >= MINCLSIZE) {
-		MCLGET(mreq, M_TRYWAIT);
+		MCLGET(mreq, M_WAIT);
 	} else
 		mreq->m_data += min(max_hdr, M_TRAILINGSPACE(mreq));
 	tl = mtod(mreq, u_int32_t *);
@@ -244,9 +244,9 @@ nfs_realign(struct mbuf **pm, int hsiz)	
 	++nfs_realign_test;
 	while ((m = *pm) != NULL) {
 		if ((m->m_len & 0x3) || (mtod(m, intptr_t) & 0x3)) {
-			MGET(n, M_TRYWAIT, MT_DATA);
+			MGET(n, M_WAIT, MT_DATA);
 			if (m->m_len >= MINCLSIZE) {
-				MCLGET(n, M_TRYWAIT);
+				MCLGET(n, M_WAIT);
 			}
 			n->m_len = 0;
 			break;
@@ -401,7 +401,7 @@ nfsmout:
  * Socket upcall routine for the nfsd sockets.
  * The caddr_t arg is a pointer to the "struct nfssvc_sock".
  * Essentially do as much as possible non-blocking, else punt and it will
- * be called with M_TRYWAIT from an nfsd.
+ * be called with M_WAIT from an nfsd.
  */
 void
 nfsrv_rcv(struct socket *so, void *arg, int waitflag)
Index: sys/nfsserver/nfs_srvsubs.c
===================================================================
RCS file: /home/ncvs/src/sys/nfsserver/nfs_srvsubs.c,v
retrieving revision 1.153
diff -u -p -r1.153 nfs_srvsubs.c
--- sys/nfsserver/nfs_srvsubs.c	18 Jan 2008 17:03:36 -0000	1.153
+++ sys/nfsserver/nfs_srvsubs.c	20 Mar 2008 09:23:46 -0000
@@ -1352,8 +1352,8 @@ nfsm_clget_xx(u_int32_t **tl, struct mbu
 	if (*bp >= *be) {
 		if (*mp == mb)
 			(*mp)->m_len += *bp - bpos;
-		MGET(nmp, M_TRYWAIT, MT_DATA);
-		MCLGET(nmp, M_TRYWAIT);
+		MGET(nmp, M_WAIT, MT_DATA);
+		MCLGET(nmp, M_WAIT);
 		nmp->m_len = NFSMSIZ(nmp);
 		(*mp)->m_next = nmp;
 		*mp = nmp;
Index: sys/nfsserver/nfs_syscalls.c
===================================================================
RCS file: /home/ncvs/src/sys/nfsserver/nfs_syscalls.c,v
retrieving revision 1.117
diff -u -p -r1.117 nfs_syscalls.c
--- sys/nfsserver/nfs_syscalls.c	12 Oct 2007 03:56:27 -0000	1.117
+++ sys/nfsserver/nfs_syscalls.c	20 Mar 2008 09:23:51 -0000
@@ -351,7 +349,7 @@ nfssvc_nfsd(struct thread *td)
 					(void) nfs_slplock(slp, 1);
 					NFSD_UNLOCK();
 					nfsrv_rcv(slp->ns_so, (caddr_t)slp,
-						M_TRYWAIT);
+						M_WAIT);
 					NFSD_LOCK();
 					nfs_slpunlock(slp);
 				}
@@ -489,7 +487,7 @@ nfssvc_nfsd(struct thread *td)
 			 * Record Mark.
 			 */
 			if (sotype == SOCK_STREAM) {
-				M_PREPEND(m, NFSX_UNSIGNED, M_TRYWAIT);
+				M_PREPEND(m, NFSX_UNSIGNED, M_WAIT);
 				*mtod(m, u_int32_t *) = htonl(0x80000000 | siz);
 			}
 			NFSD_LOCK();
Index: sys/pci/if_mn.c
===================================================================
RCS file: /home/ncvs/src/sys/pci/if_mn.c,v
retrieving revision 1.49
diff -u -p -r1.49 if_mn.c
--- sys/pci/if_mn.c	23 Feb 2007 19:41:34 -0000	1.49
+++ sys/pci/if_mn.c	20 Mar 2008 09:55:49 -0000
@@ -693,9 +693,7 @@ ngmn_connect(hook_p hook)
 	/* Setup a transmit chain with one descriptor */
 	/* XXX: we actually send a 1 byte packet */
 	dp = mn_alloc_desc();
-	MGETHDR(m, M_TRYWAIT, MT_DATA);
-	if (m == NULL)
-		return ENOBUFS;
+	MGETHDR(m, M_WAIT, MT_DATA);
 	m->m_pkthdr.len = 0;
 	dp->m = m;
 	dp->flags = 0xc0000000 + (1 << 16);
@@ -710,17 +708,8 @@ ngmn_connect(hook_p hook)
 
 	dp = mn_alloc_desc();
 	m = NULL;
-	MGETHDR(m, M_TRYWAIT, MT_DATA);
-	if (m == NULL) {
-		mn_free_desc(dp);
-		return (ENOBUFS);
-	}
-	MCLGET(m, M_TRYWAIT);
-	if ((m->m_flags & M_EXT) == 0) {
-		mn_free_desc(dp);
-		m_freem(m);
-		return (ENOBUFS);
-	}
+	MGETHDR(m, M_WAIT, MT_DATA);
+	MCLGET(m, M_WAIT);
 	dp->m = m;
 	dp->data = vtophys(m->m_data);
 	dp->flags = 0x40000000;
@@ -733,18 +722,8 @@ ngmn_connect(hook_p hook)
 		dp2 = dp;
 		dp = mn_alloc_desc();
 		m = NULL;
-		MGETHDR(m, M_TRYWAIT, MT_DATA);
-		if (m == NULL) {
-			mn_free_desc(dp);
-			m_freem(m);
-			return (ENOBUFS);
-		}
-		MCLGET(m, M_TRYWAIT);
-		if ((m->m_flags & M_EXT) == 0) {
-			mn_free_desc(dp);
-			m_freem(m);
-			return (ENOBUFS);
-		}
+		MGETHDR(m, M_WAIT, MT_DATA);
+		MCLGET(m, M_WAIT);
 		dp->m = m;
 		dp->data = vtophys(m->m_data);
 		dp->flags = 0x00000000;
Index: sys/rpc/rpcclnt.c
===================================================================
RCS file: /home/ncvs/src/sys/rpc/rpcclnt.c,v
retrieving revision 1.20
diff -u -p -r1.20 rpcclnt.c
--- sys/rpc/rpcclnt.c	6 Aug 2007 14:26:03 -0000	1.20
+++ sys/rpc/rpcclnt.c	20 Mar 2008 09:27:14 -0000
@@ -801,7 +801,7 @@ tryagain:
 			goto tryagain;
 		}
 		while (rep->r_flags & R_MUSTRESEND) {
-			m = m_copym(rep->r_mreq, 0, M_COPYALL, M_TRYWAIT);
+			m = m_copym(rep->r_mreq, 0, M_COPYALL, M_WAIT);
 			rpcstats.rpcretries++;
 			error = rpcclnt_send(so, rep->r_rpcclnt->rc_name, m, rep);
 			if (error) {
@@ -1181,7 +1181,7 @@ rpcclnt_request(rpc, mrest, procnum, td,
 	 * For stream protocols, insert a Sun RPC Record Mark.
 	 */
 	if (rpc->rc_sotype == SOCK_STREAM) {
-		M_PREPEND(m, RPCX_UNSIGNED, M_TRYWAIT);
+		M_PREPEND(m, RPCX_UNSIGNED, M_WAIT);
 		*mtod(m, u_int32_t *) = htonl(0x80000000 |
 					 (m->m_pkthdr.len - RPCX_UNSIGNED));
 	}
@@ -1229,7 +1229,7 @@ rpcclnt_request(rpc, mrest, procnum, td,
 			error = rpcclnt_sndlock(&rpc->rc_flag, task);
 		if (!error) {
 			error = rpcclnt_send(rpc->rc_so, rpc->rc_name,
-					     m_copym(m, 0, M_COPYALL, M_TRYWAIT),
+					     m_copym(m, 0, M_COPYALL, M_WAIT),
 					     task);
 			if (rpc->rc_soflags & PR_CONNREQUIRED)
 				rpcclnt_sndunlock(&rpc->rc_flag);
@@ -1750,9 +1750,9 @@ rpcclnt_realign(struct mbuf **pm, int hs
 
 	while ((m = *pm) != NULL) {
 	    if ((m->m_len & 0x3) || (mtod(m, intptr_t) & 0x3)) {
-	        MGET(n, M_TRYWAIT, MT_DATA);
+	        MGET(n, M_WAIT, MT_DATA);
 	        if (m->m_len >= MINCLSIZE) {
-	            MCLGET(n, M_TRYWAIT);
+	            MCLGET(n, M_WAIT);
 	        }
 	        n->m_len = 0;
 	        break;
@@ -1826,9 +1826,9 @@ rpcclnt_buildheader(rc, procid, mrest, m
 	struct mbuf *mreq, *mb2;
 	int error;
 
-	MGETHDR(mb, M_TRYWAIT, MT_DATA);
+	MGETHDR(mb, M_WAIT, MT_DATA);
 	if (6 * RPCX_UNSIGNED >= MINCLSIZE) {
-		MCLGET(mb, M_TRYWAIT);
+		MCLGET(mb, M_WAIT);
 	} else if (6 * RPCX_UNSIGNED < MHLEN) {
 		MH_ALIGN(mb, 6 * RPCX_UNSIGNED);
 	} else {
@@ -1908,7 +1908,7 @@ rpcm_disct(mdp, dposp, siz, left, cp2)
 	} else if (siz > MHLEN) {
 		panic("rpc S too big");
 	} else {
-		MGET(mp2, M_TRYWAIT, MT_DATA);
+		MGET(mp2, M_WAIT, MT_DATA);
 		mp2->m_next = mp->m_next;
 		mp->m_next = mp2;
 		mp->m_len -= left;
Index: sys/sys/mbuf.h
===================================================================
RCS file: /home/ncvs/src/sys/sys/mbuf.h,v
retrieving revision 1.222
diff -u -p -r1.222 mbuf.h
--- sys/sys/mbuf.h	1 Feb 2008 19:36:27 -0000	1.222
+++ sys/sys/mbuf.h	20 Mar 2008 09:57:00 -0000
@@ -291,11 +291,11 @@ struct mbstat {
  *
  * The flag to use is as follows:
  * - M_DONTWAIT or M_NOWAIT from an interrupt handler to not block allocation.
- * - M_WAIT or M_WAITOK or M_TRYWAIT from wherever it is safe to block.
+ * - M_WAIT or M_WAITOK from wherever it is safe to block.
  *
  * M_DONTWAIT/M_NOWAIT means that we will not block the thread explicitly and
  * if we cannot allocate immediately we may return NULL, whereas
- * M_WAIT/M_WAITOK/M_TRYWAIT means that if we cannot allocate resources we
+ * M_WAIT/M_WAITOK means that if we cannot allocate resources we
  * will block until they are available, and thus never return NULL.
  *
  * XXX Eventually just phase this out to use M_WAITOK/M_NOWAIT.