diff options
| author | rwatson <rwatson@FreeBSD.org> | 2003-04-14 16:04:10 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2003-04-14 16:04:10 +0000 |
| commit | c48acd8ffd3af1cedb4040a0a3d696b4336c2cfe (patch) | |
| tree | 4009b8ee6cc54e6f83527b304a645043db1ce6be | |
| parent | ac94030547f98c8a485b9f9195dea381fa3935c2 (diff) | |
| download | FreeBSD-src-c48acd8ffd3af1cedb4040a0a3d696b4336c2cfe.zip FreeBSD-src-c48acd8ffd3af1cedb4040a0a3d696b4336c2cfe.tar.gz | |
Use MBTOM() to convert mbuf allocator flags to malloc() flags, rather
than using the same compare/substitute in many places.
Obtained from: TrustedBSD Project
Sponsored by: DARPA, Network Associates Laboratories
| -rw-r--r-- | sys/kern/subr_mbuf.c | 5 | ||||
| -rw-r--r-- | sys/kern/uipc_mbuf.c | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/sys/kern/subr_mbuf.c b/sys/kern/subr_mbuf.c index f5e8abf..123553b 100644 --- a/sys/kern/subr_mbuf.c +++ b/sys/kern/subr_mbuf.c @@ -566,13 +566,12 @@ mb_pop_cont(struct mb_lstmngr *mb_list, int how, struct mb_pcpu_list *cnt_lst) return (NULL); bucket = malloc(sizeof(struct mb_bucket) + - mb_list->ml_objbucks * sizeof(void *), M_MBUF, - how == M_TRYWAIT ? M_WAITOK : M_NOWAIT); + mb_list->ml_objbucks * sizeof(void *), M_MBUF, MBTOM(how)); if (bucket == NULL) return (NULL); p = (caddr_t)kmem_malloc(mb_list->ml_map, mb_list->ml_objsize * - mb_list->ml_objbucks, how == M_TRYWAIT ? M_WAITOK : M_NOWAIT); + mb_list->ml_objbucks, MBTOM(how)); if (p == NULL) { free(bucket, M_MBUF); if (how == M_TRYWAIT) diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c index 9caeed9..55d828d 100644 --- a/sys/kern/uipc_mbuf.c +++ b/sys/kern/uipc_mbuf.c @@ -140,8 +140,7 @@ m_dup_pkthdr(struct mbuf *to, struct mbuf *from, int how) mac_create_mbuf_from_mbuf(from, to); #endif SLIST_INIT(&to->m_pkthdr.tags); - return (m_tag_copy_chain(to, from, (how & M_TRYWAIT) ? M_WAITOK : - M_NOWAIT)); + return (m_tag_copy_chain(to, from, MBTOM(how))); } /* |
