Re: cvs commit: src/sys/bus/firewire fwohci.c src/sys/contrib/dev/oltr if_oltr.c src/sys/contrib/ipfilter/netinet fil.c ip_fil.c src/sys/dev/atm/en midway.c src/sys/dev/crypto/hifn hifn7751.c src/sys/dev/crypto/ubsec ubsec.c src/sys/dev/misc/musycc musycc.c ...

[Michal Belczyk <diavul@xxxxxxxxxxxxx>]

On Sat, Dec 18, 2004 at 09:10:57PM +0000, Liam J. Foy wrote:
> On Sat, 2004-12-18 at 21:07 +0000, Liam J. Foy wrote:
> > On Sat, 2004-12-18 at 21:42 +0100, Michal Belczyk wrote:
> > > On Wed, Jun 02, 2004 at 07:43:04AM -0700, Eirik Nygaard wrote:
> > > > eirikn      2004/06/02 07:43:04 PDT
> > > > 
> > > >   Log:
> > > >   Change mbug allocation flags from M_ to MB_ to avoid confusion with malloc
> > > >   flags.
> > > 
> > > Could you please update the manpage as well?
> > > 
> > > Index: mbuf.9
> > > ===================================================================
> > > RCS file: /home/dcvs/src/share/man/man9/mbuf.9,v
> > > retrieving revision 1.2
> > > diff -u -r1.2 mbuf.9
> > > --- mbuf.9      17 Jun 2003 04:37:01 -0000      1.2
> > > +++ mbuf.9      18 Dec 2004 14:44:56 -0000
> > > @@ -242,14 +242,14 @@
> > >  The
> > >  .Fa how
> > >  argument is to be set to
> > > -.Dv M_WAIT
> > > +.Dv MB_WAIT
> > >  or
> > > -.Dv M_DONTWAIT .
> > > +.Dv MB_DONTWAIT .
> > >  It specifies whether the caller is willing to block if necessary.
> > >  If
> > >  .Fa how
> > >  is set to
> > > -.Dv M_WAIT ,
> > > +.Dv MB_WAIT ,
> > >  a failed allocation will result in the caller being put
> > >  to sleep for a designated
> > >  kern.ipc.mbuf_wait
> > > @@ -261,7 +261,7 @@
> > >  at some point need to allocate new mbufs.
> > >  .Pp
> > >  Programmers should be careful not to confuse the mbuf allocation flag
> > > -.Dv M_DONTWAIT
> > > +.Dv MB_DONTWAIT
> > >  with the
> > >  .Xr malloc 9
> > >  allocation flag,
> > > 
> > 
> > Looks fine. I will handle this.
> > 
> 
> Wait, is this ok? I now don't think it is. Eirikn?
 
envy# egrep 'MB?_(DONT)?WAIT' /sys/sys/mbuf.h
#define MB_DONTWAIT     0x4
#define MB_WAIT         MB_TRYWAIT
#define MBTOM(how)      ((how) & MB_TRYWAIT ? M_WAITOK : M_NOWAIT)
 * If how is MB_DONTWAIT and allocation fails, the original mbuf chain
#define m_copy(m, o, l) m_copym((m), (o), (l), MB_DONTWAIT)

Look here:
http://www.dragonflybsd.org/cvsweb/src/sys/sys/mbuf.h.diff?r1=1.9&r2=1.10&f=h&f=u

-- 
Michal Belczyk