Rename MBUFTRACE helper function m_claim() to m_claimm(),
for consistency with M_FREE() and m_freem(). Affected files: sys/mbuf.h kern/uipc_socket2.c kern/uipc_mbuf.c net/if_ethersubr.c netatalk/ddp_input.c nfs/nfs_socket.c
This commit is contained in:
jonathan
parent
a60209cdf0
commit
5249b5a2a5
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: uipc_mbuf.c,v 1.82 2004/05/25 04:30:32 atatat Exp $ */
|
||||
/* $NetBSD: uipc_mbuf.c,v 1.83 2004/06/24 04:15:50 jonathan Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1999, 2001 The NetBSD Foundation, Inc.
|
||||
|
|
@ -69,7 +69,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.82 2004/05/25 04:30:32 atatat Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.83 2004/06/24 04:15:50 jonathan Exp $");
|
||||
|
||||
#include "opt_mbuftrace.h"
|
||||
|
||||
|
|
@ -447,8 +447,11 @@ m_freem(struct mbuf *m)
|
|||
}
|
||||
|
||||
#ifdef MBUFTRACE
|
||||
/*
|
||||
* Walk a chain of mbufs, claiming ownership of each mbuf in the chain.
|
||||
*/
|
||||
void
|
||||
m_claim(struct mbuf *m, struct mowner *mo)
|
||||
m_claimm(struct mbuf *m, struct mowner *mo)
|
||||
{
|
||||
|
||||
for (; m != NULL; m = m->m_next)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: uipc_socket2.c,v 1.64 2004/06/11 03:46:01 jonathan Exp $ */
|
||||
/* $NetBSD: uipc_socket2.c,v 1.65 2004/06/24 04:15:50 jonathan Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1982, 1986, 1988, 1990, 1993
|
||||
|
|
@ -32,7 +32,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: uipc_socket2.c,v 1.64 2004/06/11 03:46:01 jonathan Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: uipc_socket2.c,v 1.65 2004/06/24 04:15:50 jonathan Exp $");
|
||||
|
||||
#include "opt_mbuftrace.h"
|
||||
#include "opt_sb_max.h"
|
||||
|
|
@ -542,7 +542,7 @@ sbappend(struct sockbuf *sb, struct mbuf *m)
|
|||
return;
|
||||
|
||||
#ifdef MBUFTRACE
|
||||
m_claim(m, sb->sb_mowner);
|
||||
m_claimm(m, sb->sb_mowner);
|
||||
#endif
|
||||
|
||||
SBLASTRECORDCHK(sb, "sbappend 1");
|
||||
|
|
@ -585,7 +585,7 @@ sbappendstream(struct sockbuf *sb, struct mbuf *m)
|
|||
SBLASTMBUFCHK(sb, __func__);
|
||||
|
||||
#ifdef MBUFTRACE
|
||||
m_claim(m, sb->sb_mowner);
|
||||
m_claimm(m, sb->sb_mowner);
|
||||
#endif
|
||||
|
||||
sbcompress(sb, m, sb->sb_mbtail);
|
||||
|
|
@ -632,7 +632,7 @@ sbappendrecord(struct sockbuf *sb, struct mbuf *m0)
|
|||
return;
|
||||
|
||||
#ifdef MBUFTRACE
|
||||
m_claim(m0, sb->sb_mowner);
|
||||
m_claimm(m0, sb->sb_mowner);
|
||||
#endif
|
||||
/*
|
||||
* Put the first mbuf on the queue.
|
||||
|
|
@ -720,7 +720,7 @@ sbappendaddr(struct sockbuf *sb, const struct sockaddr *asa, struct mbuf *m0,
|
|||
panic("sbappendaddr");
|
||||
space += m0->m_pkthdr.len;
|
||||
#ifdef MBUFTRACE
|
||||
m_claim(m0, sb->sb_mowner);
|
||||
m_claimm(m0, sb->sb_mowner);
|
||||
#endif
|
||||
}
|
||||
for (n = control; n; n = n->m_next) {
|
||||
|
|
@ -846,7 +846,7 @@ sbappendaddrchain(struct sockbuf *sb, const struct sockaddr *asa,
|
|||
struct mbuf *np;
|
||||
|
||||
#ifdef MBUFTRACE
|
||||
m_claim(m, sb->sb_mowner);
|
||||
m_claimm(m, sb->sb_mowner);
|
||||
#endif
|
||||
|
||||
/* Prepend sockaddr to this record (m) of input chain m0 */
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: if_ethersubr.c,v 1.115 2004/06/06 04:44:05 dyoung Exp $ */
|
||||
/* $NetBSD: if_ethersubr.c,v 1.116 2004/06/24 04:15:51 jonathan Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
|
||||
|
|
@ -61,7 +61,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.115 2004/06/06 04:44:05 dyoung Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.116 2004/06/24 04:15:51 jonathan Exp $");
|
||||
|
||||
#include "opt_inet.h"
|
||||
#include "opt_atalk.h"
|
||||
|
|
@ -211,7 +211,7 @@ ether_output(struct ifnet *ifp, struct mbuf *m0, struct sockaddr *dst,
|
|||
short mflags;
|
||||
|
||||
#ifdef MBUFTRACE
|
||||
m_claim(m, ifp->if_mowner);
|
||||
m_claimm(m, ifp->if_mowner);
|
||||
#endif
|
||||
if ((ifp->if_flags & (IFF_UP|IFF_RUNNING)) != (IFF_UP|IFF_RUNNING))
|
||||
senderr(ENETDOWN);
|
||||
|
|
@ -672,7 +672,7 @@ ether_input(struct ifnet *ifp, struct mbuf *m)
|
|||
}
|
||||
|
||||
#ifdef MBUFTRACE
|
||||
m_claim(m, &ec->ec_rx_mowner);
|
||||
m_claimm(m, &ec->ec_rx_mowner);
|
||||
#endif
|
||||
eh = mtod(m, struct ether_header *);
|
||||
etype = ntohs(eh->ether_type);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: ddp_input.c,v 1.8 2003/02/26 07:53:04 matt Exp $ */
|
||||
/* $NetBSD: ddp_input.c,v 1.9 2004/06/24 04:15:51 jonathan Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1990,1994 Regents of The University of Michigan.
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: ddp_input.c,v 1.8 2003/02/26 07:53:04 matt Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: ddp_input.c,v 1.9 2004/06/24 04:15:51 jonathan Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
|
@ -76,7 +76,7 @@ atintr()
|
|||
if (m == 0) /* no more queued packets */
|
||||
break;
|
||||
|
||||
m_claim(m, &atalk_rx_mowner);
|
||||
m_claimm(m, &atalk_rx_mowner);
|
||||
ifp = m->m_pkthdr.rcvif;
|
||||
for (aa = at_ifaddr.tqh_first; aa; aa = aa->aa_list.tqe_next) {
|
||||
if (aa->aa_ifp == ifp && (aa->aa_flags & AFA_PHASE2))
|
||||
|
|
@ -100,7 +100,7 @@ atintr()
|
|||
|
||||
break;
|
||||
|
||||
m_claim(m, &atalk_rx_mowner);
|
||||
m_claimm(m, &atalk_rx_mowner);
|
||||
ifp = m->m_pkthdr.rcvif;
|
||||
for (aa = at_ifaddr.tqh_first; aa; aa = aa->aa_list.tqe_next) {
|
||||
if (aa->aa_ifp == ifp &&
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: nfs_socket.c,v 1.107 2004/05/24 19:08:07 jonathan Exp $ */
|
||||
/* $NetBSD: nfs_socket.c,v 1.108 2004/06/24 04:15:51 jonathan Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1989, 1991, 1993, 1995
|
||||
|
|
@ -39,7 +39,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: nfs_socket.c,v 1.107 2004/05/24 19:08:07 jonathan Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: nfs_socket.c,v 1.108 2004/06/24 04:15:51 jonathan Exp $");
|
||||
|
||||
#include "fs_nfs.h"
|
||||
#include "opt_nfs.h"
|
||||
|
|
@ -2187,7 +2187,7 @@ nfsrv_getstream(slp, waitflag)
|
|||
slp->ns_flag &= ~SLP_GETSTREAM;
|
||||
return (EWOULDBLOCK);
|
||||
}
|
||||
m_claim(recm, &nfs_mowner);
|
||||
m_claimm(recm, &nfs_mowner);
|
||||
slp->ns_raw = m;
|
||||
if (m->m_next == NULL)
|
||||
slp->ns_rawend = m;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: mbuf.h,v 1.93 2004/06/22 14:04:04 itojun Exp $ */
|
||||
/* $NetBSD: mbuf.h,v 1.94 2004/06/24 04:15:50 jonathan Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1996, 1997, 1999, 2001 The NetBSD Foundation, Inc.
|
||||
|
|
@ -387,7 +387,7 @@ do { \
|
|||
#define MCLAIM(m, mowner) do { } while (/* CONSTCOND */ 0)
|
||||
#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 m_claimm(m, mo) do { } while (/* CONSTCOND */ 0)
|
||||
#define MBUFTRACE_ASSERT(cond) do { } while (/* CONSTCOND */ 0)
|
||||
#endif
|
||||
|
||||
|
|
@ -846,7 +846,7 @@ int m_apply(struct mbuf *, int, int,
|
|||
int (*)(void *, caddr_t, unsigned int), void *);
|
||||
void m_cat(struct mbuf *,struct mbuf *);
|
||||
#ifdef MBUFTRACE
|
||||
void m_claim(struct mbuf *, struct mowner *);
|
||||
void m_claimm(struct mbuf *, struct mowner *);
|
||||
#endif
|
||||
void m_clget(struct mbuf *, int);
|
||||
int m_mballoc(int, int);
|
||||
|
|
|
|||
Loading…
Reference in New Issue