linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: Sergey Senozhatsky <senozhatsky@chromium.org>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Yosry Ahmed <yosry.ahmed@linux.dev>,
	Hillf Danton <hdanton@sina.com>, Kairui Song <ryncsn@gmail.com>,
	Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
	Minchan Kim <minchan@kernel.org>,
	linux-mm@kvack.org, linux-kernel@vger.kernel.org,
	Sergey Senozhatsky <senozhatsky@chromium.org>
Subject: [PATCH v8 03/17] zram: remove unused crypto include
Date: Sat, 22 Feb 2025 07:25:34 +0900	[thread overview]
Message-ID: <20250221222958.2225035-4-senozhatsky@chromium.org> (raw)
In-Reply-To: <20250221222958.2225035-1-senozhatsky@chromium.org>

We stopped using crypto API (for the time being), so remove
its include and replace CRYPTO_MAX_ALG_NAME with a local
define.

Signed-off-by: Sergey Senozhatsky <senozhatsky@chromium.org>
---
 drivers/block/zram/zcomp.c    | 1 -
 drivers/block/zram/zram_drv.c | 4 +++-
 drivers/block/zram/zram_drv.h | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/block/zram/zcomp.c b/drivers/block/zram/zcomp.c
index 53e4c37441be..cfdde2e0748a 100644
--- a/drivers/block/zram/zcomp.c
+++ b/drivers/block/zram/zcomp.c
@@ -7,7 +7,6 @@
 #include <linux/wait.h>
 #include <linux/sched.h>
 #include <linux/cpuhotplug.h>
-#include <linux/crypto.h>
 #include <linux/vmalloc.h>
 
 #include "zcomp.h"
diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index 1b5bb206239f..c73d8024f48f 100644
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -44,6 +44,8 @@ static DEFINE_MUTEX(zram_index_mutex);
 static int zram_major;
 static const char *default_compressor = CONFIG_ZRAM_DEF_COMP;
 
+#define ZRAM_MAX_ALGO_NAME_SZ	128
+
 /* Module params (documentation at end) */
 static unsigned int num_devices = 1;
 /*
@@ -1154,7 +1156,7 @@ static int __comp_algorithm_store(struct zram *zram, u32 prio, const char *buf)
 	size_t sz;
 
 	sz = strlen(buf);
-	if (sz >= CRYPTO_MAX_ALG_NAME)
+	if (sz >= ZRAM_MAX_ALGO_NAME_SZ)
 		return -E2BIG;
 
 	compressor = kstrdup(buf, GFP_KERNEL);
diff --git a/drivers/block/zram/zram_drv.h b/drivers/block/zram/zram_drv.h
index 794c9234e627..2c380ea9a816 100644
--- a/drivers/block/zram/zram_drv.h
+++ b/drivers/block/zram/zram_drv.h
@@ -17,7 +17,6 @@
 
 #include <linux/rwsem.h>
 #include <linux/zsmalloc.h>
-#include <linux/crypto.h>
 
 #include "zcomp.h"
 
-- 
2.48.1.601.g30ceb7b040-goog



  parent reply	other threads:[~2025-02-21 22:30 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-02-21 22:25 [PATCH v8 00/17] zsmalloc/zram: there be preemption Sergey Senozhatsky
2025-02-21 22:25 ` [PATCH v8 01/17] zram: sleepable entry locking Sergey Senozhatsky
2025-02-24  8:19   ` Sebastian Andrzej Siewior
2025-02-25  4:51     ` Sergey Senozhatsky
2025-02-27 12:05       ` Sebastian Andrzej Siewior
2025-02-27 12:42         ` Sergey Senozhatsky
2025-02-27 13:04           ` Sergey Senozhatsky
2025-02-27 13:12             ` Sebastian Andrzej Siewior
2025-02-27 13:20               ` Sergey Senozhatsky
2025-02-21 22:25 ` [PATCH v8 02/17] zram: permit preemption with active compression stream Sergey Senozhatsky
2025-02-21 22:25 ` Sergey Senozhatsky [this message]
2025-02-21 22:25 ` [PATCH v8 04/17] zram: remove max_comp_streams device attr Sergey Senozhatsky
2025-02-21 22:25 ` [PATCH v8 05/17] zram: remove second stage of handle allocation Sergey Senozhatsky
2025-02-21 22:25 ` [PATCH v8 06/17] zram: remove writestall zram_stats member Sergey Senozhatsky
2025-02-21 22:25 ` [PATCH v8 07/17] zram: limit max recompress prio to num_active_comps Sergey Senozhatsky
2025-02-21 22:25 ` [PATCH v8 08/17] zram: filter out recomp targets based on priority Sergey Senozhatsky
2025-02-21 22:25 ` [PATCH v8 09/17] zram: rework recompression loop Sergey Senozhatsky
2025-02-21 22:25 ` [PATCH v8 10/17] zsmalloc: rename pool lock Sergey Senozhatsky
2025-02-21 22:25 ` [PATCH v8 11/17] zsmalloc: make zspage lock preemptible Sergey Senozhatsky
2025-02-24  8:59   ` Sebastian Andrzej Siewior
2025-02-25  4:28     ` Sergey Senozhatsky
2025-02-21 22:25 ` [PATCH v8 12/17] zsmalloc: introduce new object mapping API Sergey Senozhatsky
2025-02-24  9:01   ` Sebastian Andrzej Siewior
2025-02-25  4:29     ` Sergey Senozhatsky
2025-02-21 22:25 ` [PATCH v8 13/17] zram: switch to new zsmalloc " Sergey Senozhatsky
2025-02-21 22:25 ` [PATCH v8 14/17] zram: permit reclaim in zstd custom allocator Sergey Senozhatsky
2025-02-24  9:10   ` Sebastian Andrzej Siewior
2025-02-25  4:42     ` Sergey Senozhatsky
2025-02-26  3:01       ` Sergey Senozhatsky
2025-02-27 13:19       ` Sebastian Andrzej Siewior
2025-02-21 22:25 ` [PATCH v8 15/17] zram: do not leak page on recompress_store error path Sergey Senozhatsky
2025-02-21 22:25 ` [PATCH v8 16/17] zram: do not leak page on writeback_store " Sergey Senozhatsky
2025-02-21 22:25 ` [PATCH v8 17/17] zram: add might_sleep to zcomp API Sergey Senozhatsky

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250221222958.2225035-4-senozhatsky@chromium.org \
    --to=senozhatsky@chromium.org \
    --cc=akpm@linux-foundation.org \
    --cc=bigeasy@linutronix.de \
    --cc=hdanton@sina.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=minchan@kernel.org \
    --cc=ryncsn@gmail.com \
    --cc=yosry.ahmed@linux.dev \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox