Back out just a portion of Alfred's last commit. Remove the MBUF_CHECK
(WITNESS) for code paths that always call uma_zalloc_arg() shortly after where the check was, because uma_zalloc_arg() already does a similar check. No objections from Alfred. Thanks Alfred.
This commit is contained in:
parent
6d69b36945
commit
01e9ccbd9c
@ -105,7 +105,6 @@ m_getm(struct mbuf *m, int len, int how, short type)
|
||||
int i;
|
||||
|
||||
KASSERT(len >= 0, ("m_getm(): len is < 0"));
|
||||
MBUF_CHECKSLEEP(how);
|
||||
|
||||
/* If m != NULL, we will append to the end of that chain. */
|
||||
if (m != NULL)
|
||||
@ -331,7 +330,6 @@ m_prepend(struct mbuf *m, int len, int how)
|
||||
{
|
||||
struct mbuf *mn;
|
||||
|
||||
MBUF_CHECKSLEEP(how);
|
||||
if (m->m_flags & M_PKTHDR)
|
||||
MGETHDR(mn, how, m->m_type);
|
||||
else
|
||||
|
@ -342,7 +342,6 @@ m_get(int how, short type)
|
||||
{
|
||||
struct mb_args args;
|
||||
|
||||
MBUF_CHECKSLEEP(how);
|
||||
args.flags = 0;
|
||||
args.how = how;
|
||||
args.type = type;
|
||||
@ -357,7 +356,6 @@ m_getclr(int how, short type)
|
||||
struct mbuf *m;
|
||||
struct mb_args args;
|
||||
|
||||
MBUF_CHECKSLEEP(how);
|
||||
args.flags = 0;
|
||||
args.how = how;
|
||||
args.type = type;
|
||||
@ -373,7 +371,6 @@ m_gethdr(int how, short type)
|
||||
{
|
||||
struct mb_args args;
|
||||
|
||||
MBUF_CHECKSLEEP(how);
|
||||
args.flags = M_PKTHDR;
|
||||
args.how = how;
|
||||
args.type = type;
|
||||
@ -386,7 +383,6 @@ m_getcl(int how, short type, int flags)
|
||||
{
|
||||
struct mb_args args;
|
||||
|
||||
MBUF_CHECKSLEEP(how);
|
||||
args.flags = flags;
|
||||
args.how = how;
|
||||
args.type = type;
|
||||
@ -414,7 +410,6 @@ void
|
||||
m_clget(struct mbuf *m, int how)
|
||||
{
|
||||
|
||||
MBUF_CHECKSLEEP(how);
|
||||
m->m_ext.ext_buf = NULL;
|
||||
uma_zalloc_arg(zone_clust, m, how);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user