From fccbd1d6e2e0a95511ad3e1c743b98bf31a6b6c9 Mon Sep 17 00:00:00 2001 From: Richard Yao Date: Tue, 13 Aug 2019 09:46:12 -0400 Subject: [PATCH] Drop KMC_NOEMERGENCY MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is not implemented. If it were implemented, using it would risk deadlocks on pre-3.18 kernels. Lets just drop it. Reviewed-by: Brian Behlendorf Reviewed-by: Michael Niewöhner Signed-off-by: Richard Yao Closes #9119 --- include/spl/sys/kmem_cache.h | 2 -- module/spl/spl-zlib.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/include/spl/sys/kmem_cache.h b/include/spl/sys/kmem_cache.h index 8fa14f67e7..bb413207de 100644 --- a/include/spl/sys/kmem_cache.h +++ b/include/spl/sys/kmem_cache.h @@ -45,7 +45,6 @@ enum { KMC_BIT_VMEM = 6, /* Use vmem cache */ KMC_BIT_SLAB = 7, /* Use Linux slab cache */ KMC_BIT_OFFSLAB = 8, /* Objects not on slab */ - KMC_BIT_NOEMERGENCY = 9, /* Disable emergency objects */ KMC_BIT_DEADLOCKED = 14, /* Deadlock detected */ KMC_BIT_GROWING = 15, /* Growing in progress */ KMC_BIT_REAPING = 16, /* Reaping in progress */ @@ -73,7 +72,6 @@ typedef enum kmem_cbrc { #define KMC_VMEM (1 << KMC_BIT_VMEM) #define KMC_SLAB (1 << KMC_BIT_SLAB) #define KMC_OFFSLAB (1 << KMC_BIT_OFFSLAB) -#define KMC_NOEMERGENCY (1 << KMC_BIT_NOEMERGENCY) #define KMC_DEADLOCKED (1 << KMC_BIT_DEADLOCKED) #define KMC_GROWING (1 << KMC_BIT_GROWING) #define KMC_REAPING (1 << KMC_BIT_REAPING) diff --git a/module/spl/spl-zlib.c b/module/spl/spl-zlib.c index 229e6a44b0..62423343c1 100644 --- a/module/spl/spl-zlib.c +++ b/module/spl/spl-zlib.c @@ -202,7 +202,7 @@ spl_zlib_init(void) zlib_workspace_cache = kmem_cache_create( "spl_zlib_workspace_cache", size, 0, NULL, NULL, NULL, NULL, NULL, - KMC_VMEM | KMC_NOEMERGENCY); + KMC_VMEM); if (!zlib_workspace_cache) return (1);