Remove KMC_NOTOUCH

Remove dead code to make the implementation easier to understand.

Reviewed-by: Ryan Moeller <ryan@ixsystems.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Matt Ahrens <matt@delphix.com>
Closes #10650

diff --git a/include/os/freebsd/spl/sys/kmem.h b/include/os/freebsd/spl/sys/kmem.h
index 6155ce6b073135ee840a327e17de92a55e41d3d1..42d162d9a9832a0bd707a3887c685688a1e60816 100644 (file)
--- 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 754d7f46077e18be98a9fe8ffeb2edc6f6bd8717..ca1fdeda45416e56d0e39ae3c5d2f6f720ff7623 100644 (file)
--- 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 6b325affafe7f4f02603cd1275691b4e11c75541..6fb43d6bbfa4033f3a0a54e956edbbeaabfd81bc 100644 (file)
--- 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 8e5e2942c5a57cabf8e0c79105ee6986d2f81afa..8764c51c7fb9e17181c7cc2af5ba5aa00f87ae55 100644 (file)
--- 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)