zram: rename ZCOMP_PARAM_NO_LEVEL

Patch series "zram: support algorithm-specific parameters".

This patchset adds support for algorithm-specific parameters.  For now,
only deflate-specific winbits can be configured, which fixes deflate
support on some s390 setups.

This patch (of 2):

Use more generic name because this will be default "un-set"
value for more params in the future.

Link: https://lkml.kernel.org/r/20250514024825.1745489-1-senozhatsky@chromium.org
Link: https://lkml.kernel.org/r/20250514024825.1745489-2-senozhatsky@chromium.org
Signed-off-by: Sergey Senozhatsky <senozhatsky@chromium.org>
Reviewed-by: Mikhail Zaslonko <zaslonko@linux.ibm.com>
Cc: Minchan Kim <minchan@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/drivers/block/zram/backend_deflate.c b/drivers/block/zram/backend_deflate.c
index 0f7f252c12f44806db9c556bae71e030d6b6d4b5..4c00b5b6739fec2e35e8fcc3e3623b3960514558 100644 (file)
--- a/drivers/block/zram/backend_deflate.c
+++ b/drivers/block/zram/backend_deflate.c
@@ -22,7 +22,7 @@ static void deflate_release_params(struct zcomp_params *params)
 
 static int deflate_setup_params(struct zcomp_params *params)
 {
-       if (params->level == ZCOMP_PARAM_NO_LEVEL)
+       if (params->level == ZCOMP_PARAM_NOT_SET)
                params->level = Z_DEFAULT_COMPRESSION;
 
        return 0;

diff --git a/drivers/block/zram/backend_lz4.c b/drivers/block/zram/backend_lz4.c
index 847f3334eb38248674976361cd425fc795ef9d80..daccd60857ebd29040d24839cb3b9ab68ef02723 100644 (file)
--- a/drivers/block/zram/backend_lz4.c
+++ b/drivers/block/zram/backend_lz4.c
@@ -18,7 +18,7 @@ static void lz4_release_params(struct zcomp_params *params)
 
 static int lz4_setup_params(struct zcomp_params *params)
 {
-       if (params->level == ZCOMP_PARAM_NO_LEVEL)
+       if (params->level == ZCOMP_PARAM_NOT_SET)
                params->level = LZ4_ACCELERATION_DEFAULT;
 
        return 0;

diff --git a/drivers/block/zram/backend_lz4hc.c b/drivers/block/zram/backend_lz4hc.c
index 5f37d5abcaeb7f7a714df4db123b6ca0bffad338..9e8a35dfa56d8a9240630d7cad6965235f3aca6d 100644 (file)
--- a/drivers/block/zram/backend_lz4hc.c
+++ b/drivers/block/zram/backend_lz4hc.c
@@ -18,7 +18,7 @@ static void lz4hc_release_params(struct zcomp_params *params)
 
 static int lz4hc_setup_params(struct zcomp_params *params)
 {
-       if (params->level == ZCOMP_PARAM_NO_LEVEL)
+       if (params->level == ZCOMP_PARAM_NOT_SET)
                params->level = LZ4HC_DEFAULT_CLEVEL;
 
        return 0;

diff --git a/drivers/block/zram/backend_zstd.c b/drivers/block/zram/backend_zstd.c
index 22c8067536f3a17d9365b91ce2a6483c8b82d6ec..81defb98ed09f8be49d9857d53591fd53b51d177 100644 (file)
--- a/drivers/block/zram/backend_zstd.c
+++ b/drivers/block/zram/backend_zstd.c
@@ -58,7 +58,7 @@ static int zstd_setup_params(struct zcomp_params *params)
                return -ENOMEM;
 
        params->drv_data = zp;
-       if (params->level == ZCOMP_PARAM_NO_LEVEL)
+       if (params->level == ZCOMP_PARAM_NOT_SET)
                params->level = zstd_default_clevel();
 
        zp->cprm = zstd_get_params(params->level, PAGE_SIZE);

diff --git a/drivers/block/zram/zcomp.h b/drivers/block/zram/zcomp.h
index 25339ed1e07ec05f04f231aef86339d172e28193..cfacdfe9044c3629429d83ae9ca3a89e1aab4441 100644 (file)
--- a/drivers/block/zram/zcomp.h
+++ b/drivers/block/zram/zcomp.h
@@ -5,7 +5,7 @@
 
 #include <linux/mutex.h>
 
-#define ZCOMP_PARAM_NO_LEVEL   INT_MIN
+#define ZCOMP_PARAM_NOT_SET    INT_MIN
 
 /*
  * Immutable driver (backend) parameters. The driver may attach private

diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index 94e6e9b80bf073d7bd88f0a2663785d8e408e844..a11b7a6e35f41bb0bf4552f07774ec5c27f893bc 100644 (file)
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -1276,7 +1276,7 @@ static void comp_params_reset(struct zram *zram, u32 prio)
        struct zcomp_params *params = &zram->params[prio];
 
        vfree(params->dict);
-       params->level = ZCOMP_PARAM_NO_LEVEL;
+       params->level = ZCOMP_PARAM_NOT_SET;
        params->dict_sz = 0;
        params->dict = NULL;
 }
@@ -1308,7 +1308,7 @@ static ssize_t algorithm_params_store(struct device *dev,
                                      const char *buf,
                                      size_t len)
 {
-       s32 prio = ZRAM_PRIMARY_COMP, level = ZCOMP_PARAM_NO_LEVEL;
+       s32 prio = ZRAM_PRIMARY_COMP, level = ZCOMP_PARAM_NOT_SET;
        char *args, *param, *val, *algo = NULL, *dict_path = NULL;
        struct zram *zram = dev_to_zram(dev);
        int ret;