diff options
| author | drochner <drochner@NetBSD.org> | 2003-02-26 14:36:43 +0000 |
|---|---|---|
| committer | drochner <drochner@NetBSD.org> | 2003-02-26 14:36:43 +0000 |
| commit | 72d6120d24c2ec63bd2bef1dfa641e0a892575ab (patch) | |
| tree | 0c6590af38f4c147c33799bbb4e2ccb772d941f3 | |
| parent | fb425a12ca969eb3264cc4b41b8b4448c61d2873 (diff) | |
deactivate MBUFTRACE related KASSERT()s in the !MBUFTRACE case
| -rw-r--r-- | sys/kern/uipc_syscalls.c | 14 | ||||
| -rw-r--r-- | sys/sys/mbuf.h | 4 |
2 files changed, 10 insertions, 8 deletions
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index 02f838bb000..e311ad9f461 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -1,4 +1,4 @@ -/* $NetBSD: uipc_syscalls.c,v 1.76 2003/02/26 06:31:11 matt Exp $ */ +/* $NetBSD: uipc_syscalls.c,v 1.77 2003/02/26 14:36:43 drochner Exp $ */ /* * Copyright (c) 1982, 1986, 1989, 1990, 1993 @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls.c,v 1.76 2003/02/26 06:31:11 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls.c,v 1.77 2003/02/26 14:36:43 drochner Exp $"); #include "opt_ktrace.h" #include "opt_pipe.h" @@ -100,7 +100,7 @@ sys_socket(struct lwp *l, void *v, register_t *retval) fdremove(fdp, fd); ffree(fp); } else { - KASSERT(so->so_rcv.sb_mowner); + MBUFTRACE_ASSERT(so->so_rcv.sb_mowner); fp->f_data = (caddr_t)so; FILE_SET_MATURE(fp); FILE_UNUSE(fp, p); @@ -320,7 +320,7 @@ sys_connect(struct lwp *l, void *v, register_t *retval) if (error == ERESTART) error = EINTR; out: - KASSERT(so->so_rcv.sb_mowner); + MBUFTRACE_ASSERT(so->so_rcv.sb_mowner); FILE_UNUSE(fp, p); return (error); } @@ -559,7 +559,7 @@ sendit(struct proc *p, int s, struct msghdr *mp, int flags, register_t *retsize) if (to) m_freem(to); out: - KASSERT(so->so_rcv.sb_mowner); + MBUFTRACE_ASSERT(so->so_rcv.sb_mowner); FILE_UNUSE(fp, p); return (error); } @@ -774,7 +774,7 @@ recvit(struct proc *p, int s, struct msghdr *mp, caddr_t namelenp, if (control) m_freem(control); out1: - KASSERT(so->so_rcv.sb_mowner); + MBUFTRACE_ASSERT(so->so_rcv.sb_mowner); FILE_UNUSE(fp, p); return (error); } @@ -843,7 +843,7 @@ sys_setsockopt(struct lwp *l, void *v, register_t *retval) } error = sosetopt(so, SCARG(uap, level), SCARG(uap, name), m); out: - KASSERT(so->so_rcv.sb_mowner); + MBUFTRACE_ASSERT(so->so_rcv.sb_mowner); FILE_UNUSE(fp, p); return (error); } diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h index 232e67d458c..ff662e492cb 100644 --- a/sys/sys/mbuf.h +++ b/sys/sys/mbuf.h @@ -1,4 +1,4 @@ -/* $NetBSD: mbuf.h,v 1.75 2003/02/26 07:49:02 matt Exp $ */ +/* $NetBSD: mbuf.h,v 1.76 2003/02/26 14:36:44 drochner Exp $ */ /*- * Copyright (c) 1996, 1997, 1999, 2001 The NetBSD Foundation, Inc. @@ -313,6 +313,7 @@ do { \ #define MOWNER_ATTACH(mo) LIST_INSERT_HEAD(&mowners, (mo), mo_link) #define MOWNER_DETACH(mo) LIST_REMOVE((mo), mo_link) +#define MBUFTRACE_ASSERT(cond) KASSERT(cond) #else #define _MOWNERINIT(m, type) do { } while (/* CONSTCOND */ 0) #define _MOWNERREF(m, flags) do { } while (/* CONSTCOND */ 0) @@ -323,6 +324,7 @@ do { \ #define MOWNER_ATTACH(mo) do { } while (/* CONSTCOND */ 0) #define MOWNER_DETACH(mo) do { } while (/* CONSTCOND */ 0) #define m_claim(m, mo) do { } while (/* CONSTCOND */ 0) +#define MBUFTRACE_ASSERT(cond) do { } while (/* CONSTCOND */ 0) #endif |
