Use m_get() and m_getcl() instead of compat macros.

This commit is contained in:
glebius 2013-03-15 10:21:18 +00:00
parent f1574e6b22
commit a10c1a7c72
3 changed files with 8 additions and 7 deletions

View File

@ -644,8 +644,8 @@ sbappendaddr_locked(struct sockbuf *sb, const struct sockaddr *asa,
if (asa->sa_len > MLEN)
return (0);
#endif
MGET(m, M_NOWAIT, MT_SONAME);
if (m == 0)
m = m_get(M_NOWAIT, MT_SONAME);
if (m == NULL)
return (0);
m->m_len = asa->sa_len;
bcopy(asa, mtod(m, caddr_t), asa->sa_len);

View File

@ -192,7 +192,7 @@ nfsm_disct(struct mbuf **mdp, caddr_t *dposp, int siz, int left, int how)
} else if (siz > MHLEN) {
panic("nfs S too big");
} else {
MGET(mp2, how, MT_DATA);
mp2 = m_get(how, MT_DATA);
if (mp2 == NULL)
return (NULL);
mp2->m_len = siz;
@ -266,7 +266,7 @@ nfsm_build_xx(int s, struct mbuf **mb, caddr_t *bpos)
void *ret;
if (s > M_TRAILINGSPACE(*mb)) {
MGET(mb2, M_WAITOK, MT_DATA);
mb2 = m_get(M_WAITOK, MT_DATA);
if (s > MLEN)
panic("build > MLEN");
(*mb)->m_next = mb2;

View File

@ -123,7 +123,7 @@ xdrmbuf_getall(XDR *xdrs)
if (m)
m_adj(m, xdrs->x_handy);
else
MGET(m, M_WAITOK, MT_DATA);
m = m_get(M_WAITOK, MT_DATA);
return (m);
}
@ -228,9 +228,10 @@ xdrmbuf_putbytes(XDR *xdrs, const char *addr, u_int len)
if (xdrs->x_handy == m->m_len && M_TRAILINGSPACE(m) == 0) {
if (!m->m_next) {
MGET(n, M_WAITOK, m->m_type);
if (m->m_flags & M_EXT)
MCLGET(n, M_WAITOK);
n = m_getcl(M_WAITOK, m->m_type, 0);
else
n = m_get(M_WAITOK, m->m_type);
m->m_next = n;
}
m = m->m_next;