Skip to content

Commit ce1ed9f

Browse files
sergey-senozhatskytorvalds
authored andcommitted
zram: delete custom lzo/lz4
Remove lzo/lz4 backends, we use crypto API now. [[email protected]: zram-delete-custom-lzo-lz4-v3] Link: http://lkml.kernel.org/r/[email protected] Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Sergey Senozhatsky <[email protected]> Acked-by: Minchan Kim <[email protected]> Cc: Joonsoo Kim <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 69a30a8 commit ce1ed9f

File tree

8 files changed

+2
-174
lines changed

8 files changed

+2
-174
lines changed

drivers/block/zram/Kconfig

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,3 @@ config ZRAM
1313
disks and maybe many more.
1414

1515
See zram.txt for more information.
16-
17-
config ZRAM_LZ4_COMPRESS
18-
bool "Enable LZ4 algorithm support"
19-
depends on ZRAM
20-
select CRYPTO_LZ4
21-
default n
22-
help
23-
This option enables LZ4 compression algorithm support. Compression
24-
algorithm can be changed using `comp_algorithm' device attribute.

drivers/block/zram/Makefile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
zram-y := zcomp_lzo.o zcomp.o zram_drv.o
2-
3-
zram-$(CONFIG_ZRAM_LZ4_COMPRESS) += zcomp_lz4.o
1+
zram-y := zcomp.o zram_drv.o
42

53
obj-$(CONFIG_ZRAM) += zram.o

drivers/block/zram/zcomp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
static const char * const backends[] = {
2222
"lzo",
23-
#ifdef CONFIG_ZRAM_LZ4_COMPRESS
23+
#if IS_ENABLED(CONFIG_CRYPTO_LZ4)
2424
"lz4",
2525
#endif
2626
NULL

drivers/block/zram/zcomp.h

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,9 @@ struct zcomp_strm {
1616
struct crypto_comp *tfm;
1717
};
1818

19-
/* static compression backend */
20-
struct zcomp_backend {
21-
int (*compress)(const unsigned char *src, unsigned char *dst,
22-
size_t *dst_len, void *private);
23-
24-
int (*decompress)(const unsigned char *src, size_t src_len,
25-
unsigned char *dst);
26-
27-
void *(*create)(gfp_t flags);
28-
void (*destroy)(void *private);
29-
30-
const char *name;
31-
};
32-
3319
/* dynamic per-device compression frontend */
3420
struct zcomp {
3521
struct zcomp_strm * __percpu *stream;
36-
struct zcomp_backend *backend;
3722
struct notifier_block notifier;
3823

3924
const char *name;

drivers/block/zram/zcomp_lz4.c

Lines changed: 0 additions & 56 deletions
This file was deleted.

drivers/block/zram/zcomp_lz4.h

Lines changed: 0 additions & 17 deletions
This file was deleted.

drivers/block/zram/zcomp_lzo.c

Lines changed: 0 additions & 56 deletions
This file was deleted.

drivers/block/zram/zcomp_lzo.h

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)