diff options
| author | ru <ru@FreeBSD.org> | 2008-03-25 09:39:02 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2008-03-25 09:39:02 +0000 |
| commit | 3b1bf8c2e9222b7d27e8b9084e637a84005de7ba (patch) | |
| tree | cf0376c9359f2d1ca6e4e8e4ad4a4f722dba61a7 /sys/dev/fatm | |
| parent | 0655a583e2ccba8b534e710284a730a0d6af1375 (diff) | |
| download | FreeBSD-src-3b1bf8c2e9222b7d27e8b9084e637a84005de7ba.zip FreeBSD-src-3b1bf8c2e9222b7d27e8b9084e637a84005de7ba.tar.gz | |
Replaced the misleading uses of a historical artefact M_TRYWAIT with M_WAIT.
Removed dead code that assumed that M_TRYWAIT can return NULL; it's not true
since the advent of MBUMA.
Reviewed by: arch
There are ongoing disputes as to whether we want to switch to directly using
UMA flags M_WAITOK/M_NOWAIT for mbuf(9) allocation.
Diffstat (limited to 'sys/dev/fatm')
| -rw-r--r-- | sys/dev/fatm/if_fatm.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/sys/dev/fatm/if_fatm.c b/sys/dev/fatm/if_fatm.c index 8ba31c1..1c3bf69 100644 --- a/sys/dev/fatm/if_fatm.c +++ b/sys/dev/fatm/if_fatm.c @@ -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); |
