diff options
| author | glebius <glebius@FreeBSD.org> | 2013-03-15 10:21:18 +0000 |
|---|---|---|
| committer | glebius <glebius@FreeBSD.org> | 2013-03-15 10:21:18 +0000 |
| commit | a10c1a7c72239c6be42dd7e90417b5caef91c8c7 (patch) | |
| tree | ecddc8114093be20f249de905712462eb044319b | |
| parent | f1574e6b22a8e4c942bcaa09c0a3559a9a7e82ee (diff) | |
| download | FreeBSD-src-a10c1a7c72239c6be42dd7e90417b5caef91c8c7.zip FreeBSD-src-a10c1a7c72239c6be42dd7e90417b5caef91c8c7.tar.gz | |
Use m_get() and m_getcl() instead of compat macros.
| -rw-r--r-- | sys/kern/uipc_sockbuf.c | 4 | ||||
| -rw-r--r-- | sys/nfs/nfs_common.c | 4 | ||||
| -rw-r--r-- | sys/xdr/xdr_mbuf.c | 7 |
3 files changed, 8 insertions, 7 deletions
diff --git a/sys/kern/uipc_sockbuf.c b/sys/kern/uipc_sockbuf.c index 6325840..93c96bf 100644 --- a/sys/kern/uipc_sockbuf.c +++ b/sys/kern/uipc_sockbuf.c @@ -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); diff --git a/sys/nfs/nfs_common.c b/sys/nfs/nfs_common.c index 83e7125..ad9e7a1 100644 --- a/sys/nfs/nfs_common.c +++ b/sys/nfs/nfs_common.c @@ -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; diff --git a/sys/xdr/xdr_mbuf.c b/sys/xdr/xdr_mbuf.c index b2394bc..690c2d2 100644 --- a/sys/xdr/xdr_mbuf.c +++ b/sys/xdr/xdr_mbuf.c @@ -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; |
