svn commit: r343858 - head/sys/vm

[Gleb Smirnoff]

Author: glebius
Date: Thu Feb  7 03:55:05 2019
New Revision: 343858
URL: https://svnweb.freebsd.org/changeset/base/343858

Log:
  Now that there is only one way to allocate a slab, remove uz_slab method.
  
  Discussed with:	jeff

Modified:
  head/sys/vm/uma_core.c
  head/sys/vm/uma_int.h

Modified: head/sys/vm/uma_core.c
==============================================================================
--- head/sys/vm/uma_core.c	Thu Feb  7 03:32:45 2019	(r343857)
+++ head/sys/vm/uma_core.c	Thu Feb  7 03:55:05 2019	(r343858)
@@ -1746,7 +1746,6 @@ zone_ctor(void *mem, int size, void *udata, int flags)
 	zone->uz_name = arg->name;
 	zone->uz_ctor = arg->ctor;
 	zone->uz_dtor = arg->dtor;
-	zone->uz_slab = zone_fetch_slab;
 	zone->uz_init = NULL;
 	zone->uz_fini = NULL;
 	zone->uz_sleeps = 0;
@@ -2797,7 +2796,7 @@ zone_import(uma_zone_t zone, void **bucket, int max, i
 	keg = NULL;
 	/* Try to keep the buckets totally full */
 	for (i = 0; i < max; ) {
-		if ((slab = zone->uz_slab(zone, keg, domain, flags)) == NULL)
+		if ((slab = zone_fetch_slab(zone, keg, domain, flags)) == NULL)
 			break;
 		keg = slab->us_keg;
 #ifdef NUMA

Modified: head/sys/vm/uma_int.h
==============================================================================
--- head/sys/vm/uma_int.h	Thu Feb  7 03:32:45 2019	(r343857)
+++ head/sys/vm/uma_int.h	Thu Feb  7 03:55:05 2019	(r343858)
@@ -304,7 +304,6 @@ struct uma_slab {
 #endif
 
 typedef struct uma_slab * uma_slab_t;
-typedef uma_slab_t (*uma_slaballoc)(uma_zone_t, uma_keg_t, int, int);
 
 struct uma_zone_domain {
 	LIST_HEAD(,uma_bucket)	uzd_buckets;	/* full buckets */
@@ -345,7 +344,7 @@ struct uma_zone {
 	void		*uz_arg;	/* Import/release argument. */
 	uma_init	uz_init;	/* Initializer for each item */
 	uma_fini	uz_fini;	/* Finalizer for each item. */
-	uma_slaballoc	uz_slab;	/* Allocate a slab from the backend. */
+	void		*uz_spare;
 	uint64_t	uz_bkt_count;    /* Items in bucket cache */
 	uint64_t	uz_bkt_max;	/* Maximum bucket cache size */