Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 8 Jul 2011 12:50:35 +0000 (UTC)
From:      Gleb Smirnoff <glebius@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject:   svn commit: r223867 - stable/8/share/man/man9
Message-ID:  <201107081250.p68CoZlW018986@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: glebius
Date: Fri Jul  8 12:50:35 2011
New Revision: 223867
URL: http://svn.freebsd.org/changeset/base/223867

Log:
  Merge from head/ 220787:
    It is already seven years since mbuf allocator uses same
    M_WAITOK/M_NOWAIT flags as malloc(9). Update manual page.
  
    Submitted by: Vadim Goncharov <vadimnuclight tpu.ru>

Modified:
  stable/8/share/man/man9/mbuf.9
Directory Properties:
  stable/8/share/man/man9/   (props changed)

Modified: stable/8/share/man/man9/mbuf.9
==============================================================================
--- stable/8/share/man/man9/mbuf.9	Fri Jul  8 12:19:25 2011	(r223866)
+++ stable/8/share/man/man9/mbuf.9	Fri Jul  8 12:50:35 2011	(r223867)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 25, 2008
+.Dd April 18, 2011
 .Dt MBUF 9
 .Os
 .\"
@@ -356,9 +356,9 @@ on failure.
 The
 .Fa how
 argument is to be set to
-.Dv M_WAIT
+.Dv M_WAITOK
 or
-.Dv M_DONTWAIT .
+.Dv M_NOWAIT .
 It specifies whether the caller is willing to block if necessary.
 A number of other functions and macros related to
 .Vt mbufs
@@ -366,15 +366,16 @@ have the same argument because they may
 at some point need to allocate new
 .Vt mbufs .
 .Pp
-Programmers should be careful not to confuse the
+Historical
 .Vt mbuf
-allocation flag
-.Dv M_DONTWAIT
-with the
-.Xr malloc 9
-allocation flag,
-.Dv M_NOWAIT .
-They are not the same.
+allocator (See
+.Sx HISTORY
+section) used allocation flags
+.Dv M_WAIT
+and
+.Dv M_DONTWAIT .
+These constants are kept for compatibility
+and their use in new code is discouraged.
 .It Fn MGETHDR mbuf how type
 Allocate an
 .Vt mbuf
@@ -912,9 +913,9 @@ Upon success, the original chain will be
 chain will be returned.
 .Fa how
 should be either
-.Dv M_WAIT
+.Dv M_WAITOK
 or
-.Dv M_DONTWAIT ,
+.Dv M_NOWAIT ,
 depending on the caller's preference.
 .Pp
 This function is especially useful in network drivers, where
@@ -930,9 +931,9 @@ The original mbuf chain is always reclai
 count of any shared mbuf clusters is decremented.
 .Fa how
 should be either
-.Dv M_WAIT
+.Dv M_WAITOK
 or
-.Dv M_DONTWAIT ,
+.Dv M_NOWAIT ,
 depending on the caller's preference.
 As a side-effect of this process the returned
 mbuf chain may be compacted.



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201107081250.p68CoZlW018986>