diff options
| author | Matthew Ahrens <[email protected]> | 2020-07-30 13:43:18 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2020-08-05 10:27:46 -0700 |
| commit | f68af67a0ce07e3f1035792d243978dca9257de6 (patch) | |
| tree | 07896d4c3a97d7afbc7a60d5e6463e85ff5c8cb6 | |
| parent | 492db125dc45e79a2347cd6c277456a846a60509 (diff) | |
Remove KMC_NOTOUCH
Remove dead code to make the implementation easier to understand.
Reviewed-by: Ryan Moeller <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Matt Ahrens <[email protected]>
Closes #10650
| -rw-r--r-- | include/os/freebsd/spl/sys/kmem.h | 1 | ||||
| -rw-r--r-- | include/os/linux/spl/sys/kmem_cache.h | 2 | ||||
| -rw-r--r-- | module/os/freebsd/zfs/abd_os.c | 2 | ||||
| -rw-r--r-- | module/os/linux/spl/spl-kmem-cache.c | 1 |
4 files changed, 1 insertions, 5 deletions
diff --git a/include/os/freebsd/spl/sys/kmem.h b/include/os/freebsd/spl/sys/kmem.h index 6155ce6b0..42d162d9a 100644 --- a/include/os/freebsd/spl/sys/kmem.h +++ b/include/os/freebsd/spl/sys/kmem.h @@ -49,7 +49,6 @@ MALLOC_DECLARE(M_SOLARIS); #define KM_NODEBUG M_NODUMP #define KM_NORMALPRI 0 #define KMC_NODEBUG UMA_ZONE_NODUMP -#define KMC_NOTOUCH 0 typedef struct vmem vmem_t; diff --git a/include/os/linux/spl/sys/kmem_cache.h b/include/os/linux/spl/sys/kmem_cache.h index 754d7f460..ca1fdeda4 100644 --- a/include/os/linux/spl/sys/kmem_cache.h +++ b/include/os/linux/spl/sys/kmem_cache.h @@ -36,7 +36,6 @@ * destructors which the Linux slab does not. */ typedef enum kmc_bit { - KMC_BIT_NOTOUCH = 0, /* Don't update ages */ KMC_BIT_NODEBUG = 1, /* Default behavior */ KMC_BIT_NOMAGAZINE = 2, /* XXX: Unsupported */ KMC_BIT_NOHASH = 3, /* XXX: Unsupported */ @@ -63,7 +62,6 @@ typedef enum kmem_cbrc { KMEM_CBRC_DONT_KNOW = 4, /* Object unknown */ } kmem_cbrc_t; -#define KMC_NOTOUCH (1 << KMC_BIT_NOTOUCH) #define KMC_NODEBUG (1 << KMC_BIT_NODEBUG) #define KMC_NOMAGAZINE (1 << KMC_BIT_NOMAGAZINE) #define KMC_NOHASH (1 << KMC_BIT_NOHASH) diff --git a/module/os/freebsd/zfs/abd_os.c b/module/os/freebsd/zfs/abd_os.c index 6b325affa..6fb43d6bb 100644 --- a/module/os/freebsd/zfs/abd_os.c +++ b/module/os/freebsd/zfs/abd_os.c @@ -275,7 +275,7 @@ void abd_init(void) { abd_chunk_cache = kmem_cache_create("abd_chunk", zfs_abd_chunk_size, 0, - NULL, NULL, NULL, NULL, 0, KMC_NOTOUCH | KMC_NODEBUG); + NULL, NULL, NULL, NULL, 0, KMC_NODEBUG); abd_ksp = kstat_create("zfs", 0, "abdstats", "misc", KSTAT_TYPE_NAMED, sizeof (abd_stats) / sizeof (kstat_named_t), KSTAT_FLAG_VIRTUAL); diff --git a/module/os/linux/spl/spl-kmem-cache.c b/module/os/linux/spl/spl-kmem-cache.c index 8e5e2942c..8764c51c7 100644 --- a/module/os/linux/spl/spl-kmem-cache.c +++ b/module/os/linux/spl/spl-kmem-cache.c @@ -720,7 +720,6 @@ spl_magazine_destroy(spl_kmem_cache_t *skc) * KMC_VMEM Force SPL vmem backed cache * KMC_KVMEM Force kvmem backed SPL cache * KMC_SLAB Force Linux slab backed cache - * KMC_NOTOUCH Disable cache object aging (unsupported) * KMC_NODEBUG Disable debugging (unsupported) * KMC_NOHASH Disable hashing (unsupported) * KMC_QCACHE Disable qcache (unsupported) |