diff options
| author | Richard Yao <[email protected]> | 2019-08-13 09:46:12 -0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2019-08-13 07:46:12 -0600 |
| commit | fccbd1d6e2e0a95511ad3e1c743b98bf31a6b6c9 (patch) | |
| tree | 9ec8a7ac2c9f23f0970d995b5c22b9e8ccb32552 | |
| parent | 3b9edd7b171f510b0abb9c885aa5b77114b8169a (diff) | |
Drop KMC_NOEMERGENCY
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 <[email protected]>
Reviewed-by: Michael Niewöhner <[email protected]>
Signed-off-by: Richard Yao <[email protected]>
Closes #9119
| -rw-r--r-- | include/spl/sys/kmem_cache.h | 2 | ||||
| -rw-r--r-- | module/spl/spl-zlib.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/include/spl/sys/kmem_cache.h b/include/spl/sys/kmem_cache.h index 8fa14f67e..bb413207d 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 229e6a44b..62423343c 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); |