diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/os/freebsd/spl/sys/kmem.h | 3 | ||||
| -rw-r--r-- | include/os/linux/spl/sys/kmem_cache.h | 7 | ||||
| -rw-r--r-- | include/os/linux/spl/sys/vmem.h | 7 | ||||
| -rw-r--r-- | include/sys/arc_impl.h | 1 | ||||
| -rw-r--r-- | include/sys/zfs_context.h | 3 |
5 files changed, 2 insertions, 19 deletions
diff --git a/include/os/freebsd/spl/sys/kmem.h b/include/os/freebsd/spl/sys/kmem.h index cb61603d7..943b18f03 100644 --- a/include/os/freebsd/spl/sys/kmem.h +++ b/include/os/freebsd/spl/sys/kmem.h @@ -90,13 +90,10 @@ void *calloc(size_t n, size_t s); #define kmem_cache_reap_now kmem_cache_reap_soon #define freemem vm_free_count() #define minfree vm_cnt.v_free_min -#define heap_arena kernel_arena -#define zio_arena NULL #define kmem_alloc(size, kmflags) zfs_kmem_alloc((size), (kmflags)) #define kmem_zalloc(size, kmflags) \ zfs_kmem_alloc((size), (kmflags) | M_ZERO) #define kmem_free(buf, size) zfs_kmem_free((buf), (size)) -#define vmem_qcache_reap(ptr) ((void)0) #endif /* _OPENSOLARIS_SYS_KMEM_H_ */ diff --git a/include/os/linux/spl/sys/kmem_cache.h b/include/os/linux/spl/sys/kmem_cache.h index ed63f4000..ce18eb474 100644 --- a/include/os/linux/spl/sys/kmem_cache.h +++ b/include/os/linux/spl/sys/kmem_cache.h @@ -100,7 +100,6 @@ extern struct rw_semaphore spl_kmem_cache_sem; #define SKC_MAGIC 0x2c2c2c2c #define SPL_KMEM_CACHE_DELAY 15 /* Minimum slab release age */ -#define SPL_KMEM_CACHE_REAP 0 /* Default reap everything */ #define SPL_KMEM_CACHE_OBJ_PER_SLAB 8 /* Target objects per slab */ #define SPL_KMEM_CACHE_OBJ_PER_SLAB_MIN 1 /* Minimum objects per slab */ #define SPL_KMEM_CACHE_ALIGN 8 /* Default object alignment */ @@ -185,7 +184,6 @@ typedef struct spl_kmem_cache { uint32_t skc_slab_objs; /* Objects per slab */ uint32_t skc_slab_size; /* Slab size */ uint32_t skc_delay; /* Slab reclaim interval */ - uint32_t skc_reap; /* Slab reclaim count */ atomic_t skc_ref; /* Ref count callers */ taskqid_t skc_taskqid; /* Slab reclaim task */ struct list_head skc_list; /* List of caches linkage */ @@ -219,7 +217,7 @@ extern void spl_kmem_cache_destroy(spl_kmem_cache_t *skc); extern void *spl_kmem_cache_alloc(spl_kmem_cache_t *skc, int flags); extern void spl_kmem_cache_free(spl_kmem_cache_t *skc, void *obj); extern void spl_kmem_cache_set_allocflags(spl_kmem_cache_t *skc, gfp_t flags); -extern void spl_kmem_cache_reap_now(spl_kmem_cache_t *skc, int count); +extern void spl_kmem_cache_reap_now(spl_kmem_cache_t *skc); extern void spl_kmem_reap(void); extern uint64_t spl_kmem_cache_inuse(kmem_cache_t *cache); extern uint64_t spl_kmem_cache_entry_size(kmem_cache_t *cache); @@ -230,8 +228,7 @@ extern uint64_t spl_kmem_cache_entry_size(kmem_cache_t *cache); #define kmem_cache_destroy(skc) spl_kmem_cache_destroy(skc) #define kmem_cache_alloc(skc, flags) spl_kmem_cache_alloc(skc, flags) #define kmem_cache_free(skc, obj) spl_kmem_cache_free(skc, obj) -#define kmem_cache_reap_now(skc) \ - spl_kmem_cache_reap_now(skc, skc->skc_reap) +#define kmem_cache_reap_now(skc) spl_kmem_cache_reap_now(skc) #define kmem_reap() spl_kmem_reap() /* diff --git a/include/os/linux/spl/sys/vmem.h b/include/os/linux/spl/sys/vmem.h index a9b12eeb9..a31b4728c 100644 --- a/include/os/linux/spl/sys/vmem.h +++ b/include/os/linux/spl/sys/vmem.h @@ -31,12 +31,6 @@ typedef struct vmem { } vmem_t; -extern vmem_t *heap_arena; -extern vmem_t *zio_alloc_arena; -extern vmem_t *zio_arena; - -extern size_t vmem_size(vmem_t *vmp, int typemask); - /* * Memory allocation interfaces */ @@ -97,7 +91,6 @@ extern size_t vmem_size(vmem_t *vmp, int typemask); #define vmem_alloc(sz, fl) spl_vmem_alloc((sz), (fl), __func__, __LINE__) #define vmem_zalloc(sz, fl) spl_vmem_zalloc((sz), (fl), __func__, __LINE__) #define vmem_free(ptr, sz) spl_vmem_free((ptr), (sz)) -#define vmem_qcache_reap(ptr) ((void)0) extern void *spl_vmem_alloc(size_t sz, int fl, const char *func, int line); extern void *spl_vmem_zalloc(size_t sz, int fl, const char *func, int line); diff --git a/include/sys/arc_impl.h b/include/sys/arc_impl.h index 075e85d12..096a9d85c 100644 --- a/include/sys/arc_impl.h +++ b/include/sys/arc_impl.h @@ -872,7 +872,6 @@ typedef enum free_memory_reason_t { #define arc_sys_free ARCSTAT(arcstat_sys_free) /* target system free bytes */ #define arc_need_free ARCSTAT(arcstat_need_free) /* bytes to be freed */ -extern int arc_zio_arena_free_shift; extern taskq_t *arc_prune_taskq; extern arc_stats_t arc_stats; extern hrtime_t arc_growtime; diff --git a/include/sys/zfs_context.h b/include/sys/zfs_context.h index 969856cc8..ba6a1a2c9 100644 --- a/include/sys/zfs_context.h +++ b/include/sys/zfs_context.h @@ -413,12 +413,9 @@ void procfs_list_add(procfs_list_t *procfs_list, void *p); #define kmem_debugging() 0 #define kmem_cache_reap_now(_c) umem_cache_reap_now(_c); #define kmem_cache_set_move(_c, _cb) /* nothing */ -#define vmem_qcache_reap(_v) /* nothing */ #define POINTER_INVALIDATE(_pp) /* nothing */ #define POINTER_IS_VALID(_p) 0 -extern vmem_t *zio_arena; - typedef umem_cache_t kmem_cache_t; typedef enum kmem_cbrc { |