Mechanically substitute flags from historic mbuf allocator with

malloc(9) flags within sys.

Exceptions:

- sys/contrib not touched
- sys/mbuf.h edited manually

8 files changed, 14 insertions, 14 deletions

diff --git a/sys/rpc/clnt_dg.c b/sys/rpc/clnt_dg.c
index c86b18a..86a8d01 100644
--- a/sys/rpc/clnt_dg.c
+++ b/sys/rpc/clnt_dg.c
@@ -431,7 +431,7 @@ call_again:
 send_again:
 	mtx_unlock(&cs->cs_lock);
 
-	MGETHDR(mreq, M_WAIT, MT_DATA);
+	MGETHDR(mreq, M_WAITOK, MT_DATA);
 	KASSERT(cu->cu_mcalllen <= MHLEN, ("RPC header too big"));
 	bcopy(cu->cu_mcallc, mreq->m_data, cu->cu_mcalllen);
 	mreq->m_len = cu->cu_mcalllen;
diff --git a/sys/rpc/clnt_vc.c b/sys/rpc/clnt_vc.c
index 26f23fa..6655e6e 100644
--- a/sys/rpc/clnt_vc.c
+++ b/sys/rpc/clnt_vc.c
@@ -386,7 +386,7 @@ call_again:
 	/*
 	 * Leave space to pre-pend the record mark.
 	 */
-	MGETHDR(mreq, M_WAIT, MT_DATA);
+	MGETHDR(mreq, M_WAITOK, MT_DATA);
 	mreq->m_data += sizeof(uint32_t);
 	KASSERT(ct->ct_mpos + sizeof(uint32_t) <= MHLEN,
 	    ("RPC header too big"));
@@ -414,7 +414,7 @@ call_again:
 	/*
 	 * Prepend a record marker containing the packet length.
 	 */
-	M_PREPEND(mreq, sizeof(uint32_t), M_WAIT);
+	M_PREPEND(mreq, sizeof(uint32_t), M_WAITOK);
 	*mtod(mreq, uint32_t *) =
 		htonl(0x80000000 | (mreq->m_pkthdr.len - sizeof(uint32_t)));
 
diff --git a/sys/rpc/rpc_generic.c b/sys/rpc/rpc_generic.c
index 6adae38..65f57cf 100644
--- a/sys/rpc/rpc_generic.c
+++ b/sys/rpc/rpc_generic.c
@@ -750,8 +750,8 @@ clnt_call_private(
 	struct mbuf *mrep;
 	enum clnt_stat stat;
 
-	MGET(mreq, M_WAIT, MT_DATA);
-	MCLGET(mreq, M_WAIT);
+	MGET(mreq, M_WAITOK, MT_DATA);
+	MCLGET(mreq, M_WAITOK);
 	mreq->m_len = 0;
 
 	xdrmbuf_create(&xdrs, mreq, XDR_ENCODE);
diff --git a/sys/rpc/rpcm_subs.h b/sys/rpc/rpcm_subs.h
index ac789f3..f0d60a3 100644
--- a/sys/rpc/rpcm_subs.h
+++ b/sys/rpc/rpcm_subs.h
@@ -80,7 +80,7 @@
 
 #define	rpcm_build(a,c,s) \
 		{ if ((s) > M_TRAILINGSPACE(mb)) { \
-			MGET(mb2, M_WAIT, MT_DATA); \
+			MGET(mb2, M_WAITOK, MT_DATA); \
 			if ((s) > MLEN) \
 				panic("build > MLEN"); \
 			mb->m_next = mb2; \
diff --git a/sys/rpc/rpcsec_gss/rpcsec_gss_prot.c b/sys/rpc/rpcsec_gss/rpcsec_gss_prot.c
index 91112a1..a50c4fa 100644
--- a/sys/rpc/rpcsec_gss/rpcsec_gss_prot.c
+++ b/sys/rpc/rpcsec_gss/rpcsec_gss_prot.c
@@ -107,7 +107,7 @@ put_uint32(struct mbuf **mp, uint32_t v)
 	struct mbuf *m = *mp;
 	uint32_t n;
 
-	M_PREPEND(m, sizeof(uint32_t), M_WAIT);
+	M_PREPEND(m, sizeof(uint32_t), M_WAITOK);
 	n = htonl(v);
 	bcopy(&n, mtod(m, uint32_t *), sizeof(uint32_t));
 	*mp = m;
@@ -241,7 +241,7 @@ xdr_rpc_gss_unwrap_data(struct mbuf **resultsp,
 		 */
 		len = get_uint32(&results);
 		message = results;
-		results = m_split(results, len, M_WAIT);
+		results = m_split(results, len, M_WAITOK);
 		if (!results) {
 			m_freem(message);
 			return (FALSE);
diff --git a/sys/rpc/svc.c b/sys/rpc/svc.c
index 16e911a..f038e78 100644
--- a/sys/rpc/svc.c
+++ b/sys/rpc/svc.c
@@ -563,8 +563,8 @@ svc_sendreply(struct svc_req *rqstp, xdrproc_t xdr_results, void * xdr_location)
 	rply.acpted_rply.ar_results.where = NULL;
 	rply.acpted_rply.ar_results.proc = (xdrproc_t) xdr_void;
 
-	MGET(m, M_WAIT, MT_DATA);
-	MCLGET(m, M_WAIT);
+	MGET(m, M_WAITOK, MT_DATA);
+	MCLGET(m, M_WAITOK);
 	m->m_len = 0;
 	xdrmbuf_create(&xdrs, m, XDR_ENCODE);
 	ok = xdr_results(&xdrs, xdr_location);
diff --git a/sys/rpc/svc_dg.c b/sys/rpc/svc_dg.c
index adfe2b5..ba6a56e 100644
--- a/sys/rpc/svc_dg.c
+++ b/sys/rpc/svc_dg.c
@@ -238,7 +238,7 @@ svc_dg_reply(SVCXPRT *xprt, struct rpc_msg *msg,
 	bool_t stat = TRUE;
 	int error;
 
-	MGETHDR(mrep, M_WAIT, MT_DATA);
+	MGETHDR(mrep, M_WAITOK, MT_DATA);
 	mrep->m_len = 0;
 
 	xdrmbuf_create(&xdrs, mrep, XDR_ENCODE);
diff --git a/sys/rpc/svc_vc.c b/sys/rpc/svc_vc.c
index fddcf58..ca8239b 100644
--- a/sys/rpc/svc_vc.c
+++ b/sys/rpc/svc_vc.c
@@ -572,7 +572,7 @@ svc_vc_recv(SVCXPRT *xprt, struct rpc_msg *msg,
 				if (cd->mpending->m_next
 				    || cd->mpending->m_len > cd->resid)
 					cd->mpending = m_split(cd->mpending,
-					    cd->resid, M_WAIT);
+					    cd->resid, M_WAITOK);
 				else
 					cd->mpending = NULL;
 				if (cd->mreq)
@@ -691,7 +691,7 @@ svc_vc_reply(SVCXPRT *xprt, struct rpc_msg *msg,
 	/*
 	 * Leave space for record mark.
 	 */
-	MGETHDR(mrep, M_WAIT, MT_DATA);
+	MGETHDR(mrep, M_WAITOK, MT_DATA);
 	mrep->m_len = 0;
 	mrep->m_data += sizeof(uint32_t);
 
@@ -713,7 +713,7 @@ svc_vc_reply(SVCXPRT *xprt, struct rpc_msg *msg,
 		/*
 		 * Prepend a record marker containing the reply length.
 		 */
-		M_PREPEND(mrep, sizeof(uint32_t), M_WAIT);
+		M_PREPEND(mrep, sizeof(uint32_t), M_WAITOK);
 		*mtod(mrep, uint32_t *) =
 			htonl(0x80000000 | (mrep->m_pkthdr.len
 				- sizeof(uint32_t)));