svn commit: r317580 - in stable/11: share/man/man9 tools/tools/umastat

[Gleb Smirnoff]

Author: glebius
Date: Sat Apr 29 02:03:20 2017
New Revision: 317580
URL: https://svnweb.freebsd.org/changeset/base/317580

Log:
  Merge r317444, r317445:
  
    UMA_ZONE_REFCNT was removed.
  
  PR:		209715
  PR:		218887

Modified:
  stable/11/share/man/man9/Makefile
  stable/11/share/man/man9/zone.9
  stable/11/tools/tools/umastat/umastat.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/share/man/man9/Makefile
==============================================================================
--- stable/11/share/man/man9/Makefile	Sat Apr 29 01:04:39 2017	(r317579)
+++ stable/11/share/man/man9/Makefile	Sat Apr 29 02:03:20 2017	(r317580)
@@ -1932,7 +1932,6 @@ MLINKS+=vrele.9 vput.9 \
 	vrele.9 vunref.9
 MLINKS+=vslock.9 vsunlock.9
 MLINKS+=zone.9 uma.9 \
-	zone.9 uma_find_refcnt.9 \
 	zone.9 uma_zalloc.9 \
 	zone.9 uma_zalloc_arg.9 \
 	zone.9 uma_zcreate.9 \

Modified: stable/11/share/man/man9/zone.9
==============================================================================
--- stable/11/share/man/man9/zone.9	Sat Apr 29 01:04:39 2017	(r317579)
+++ stable/11/share/man/man9/zone.9	Sat Apr 29 02:03:20 2017	(r317580)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 20, 2015
+.Dd April 26, 2017
 .Dt ZONE 9
 .Os
 .Sh NAME
@@ -34,7 +34,6 @@
 .Nm uma_zalloc_arg ,
 .Nm uma_zfree ,
 .Nm uma_zfree_arg ,
-.Nm uma_find_refcnt ,
 .Nm uma_zdestroy ,
 .Nm uma_zone_set_max,
 .Nm uma_zone_get_max,
@@ -60,8 +59,6 @@
 .Fn uma_zfree "uma_zone_t zone" "void *item"
 .Ft void
 .Fn uma_zfree_arg "uma_zone_t zone" "void *item" "void *arg"
-.Ft "uint32_t *"
-.Fn uma_find_refcnt "uma_zone_t zone" "void *item"
 .Ft void
 .Fn uma_zdestroy "uma_zone_t zone"
 .Ft int
@@ -155,10 +152,6 @@ is a subset of the following flags:
 .Bl -tag -width "foo"
 .It Dv UMA_ZONE_NOFREE
 Slabs of the zone are never returned back to VM.
-.It Dv UMA_ZONE_REFCNT
-Each item in the zone would have internal reference counter associated with it.
-See
-.Fn uma_find_refcnt .
 .It Dv UMA_ZONE_NODUMP
 Pages belonging to the zone will not be included into mini-dumps.
 .It Dv UMA_ZONE_PCPU
@@ -257,13 +250,6 @@ and
 .Dv dtor
 functions, respectively.
 .Pp
-If zone was created with
-.Dv UMA_ZONE_REFCNT
-flag, then pointer to reference counter for an item can be retrieved with
-help of the
-.Fn uma_find_refcnt
-function.
-.Pp
 Created zones,
 which are empty,
 can be destroyed using

Modified: stable/11/tools/tools/umastat/umastat.c
==============================================================================
--- stable/11/tools/tools/umastat/umastat.c	Sat Apr 29 01:04:39 2017	(r317579)
+++ stable/11/tools/tools/umastat/umastat.c	Sat Apr 29 02:03:20 2017	(r317580)
@@ -133,7 +133,6 @@ static const struct flaginfo {
 	{ UMA_ZONE_VM, "vm" },
 	{ UMA_ZONE_HASH, "hash" },
 	{ UMA_ZONE_SECONDARY, "secondary" },
-	{ UMA_ZONE_REFCNT, "refcnt" },
 	{ UMA_ZONE_MAXBUCKET, "maxbucket" },
 	{ UMA_ZONE_CACHESPREAD, "cachespread" },
 	{ UMA_ZONE_VTOSLAB, "vtoslab" },