|
@@ -75,9 +75,10 @@ static u64 zswap_duplicate_entry;
|
|
|
/*********************************
|
|
|
* tunables
|
|
|
**********************************/
|
|
|
-/* Enable/disable zswap (disabled by default, fixed at boot for now) */
|
|
|
-static bool zswap_enabled __read_mostly;
|
|
|
-module_param_named(enabled, zswap_enabled, bool, 0444);
|
|
|
+
|
|
|
+/* Enable/disable zswap (disabled by default) */
|
|
|
+static bool zswap_enabled;
|
|
|
+module_param_named(enabled, zswap_enabled, bool, 0644);
|
|
|
|
|
|
/* Compressor to be used by zswap (fixed at boot for now) */
|
|
|
#define ZSWAP_COMPRESSOR_DEFAULT "lzo"
|
|
@@ -648,7 +649,7 @@ static int zswap_frontswap_store(unsigned type, pgoff_t offset,
|
|
|
u8 *src, *dst;
|
|
|
struct zswap_header *zhdr;
|
|
|
|
|
|
- if (!tree) {
|
|
|
+ if (!zswap_enabled || !tree) {
|
|
|
ret = -ENODEV;
|
|
|
goto reject;
|
|
|
}
|
|
@@ -901,9 +902,6 @@ static int __init init_zswap(void)
|
|
|
{
|
|
|
gfp_t gfp = __GFP_NORETRY | __GFP_NOWARN;
|
|
|
|
|
|
- if (!zswap_enabled)
|
|
|
- return 0;
|
|
|
-
|
|
|
pr_info("loading zswap\n");
|
|
|
|
|
|
zswap_pool = zpool_create_pool(zswap_zpool_type, "zswap", gfp,
|