zram: delete custom lzo/lz4 (ce1ed9f9) · Commits · 戴 / test

drivers/block/zram/Kconfig

+0 −9

Original line number	Original line	Diff line number	Diff line
	@@ -13,12 +13,3 @@ config ZRAM
	disks and maybe many more.		disks and maybe many more.

	See zram.txt for more information.		See zram.txt for more information.

	config ZRAM_LZ4_COMPRESS
	bool "Enable LZ4 algorithm support"
	depends on ZRAM
	select CRYPTO_LZ4
	default n
	help
	This option enables LZ4 compression algorithm support. Compression
	algorithm can be changed using `comp_algorithm' device attribute.

+1 −3

Original line number	Original line	Diff line number	Diff line
	zram-y := zcomp_lzo.o zcomp.o zram_drv.o		zram-y := zcomp.o zram_drv.o

	zram-$(CONFIG_ZRAM_LZ4_COMPRESS) += zcomp_lz4.o

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -20,7 +20,7 @@

	static const char * const backends[] = {		static const char * const backends[] = {
	"lzo",		"lzo",
	#ifdef CONFIG_ZRAM_LZ4_COMPRESS		#if IS_ENABLED(CONFIG_CRYPTO_LZ4)
	"lz4",		"lz4",
	#endif		#endif
	NULL		NULL

+0 −15

Original line number	Original line	Diff line number	Diff line
	@@ -16,24 +16,9 @@ struct zcomp_strm {
	struct crypto_comp *tfm;		struct crypto_comp *tfm;
	};		};

	/* static compression backend */
	struct zcomp_backend {
	int (compress)(const unsigned char src, unsigned char *dst,
	size_t dst_len, void private);

	int (decompress)(const unsigned char src, size_t src_len,
	unsigned char *dst);

	void (create)(gfp_t flags);
	void (destroy)(void private);

	const char *name;
	};

	/* dynamic per-device compression frontend */		/* dynamic per-device compression frontend */
	struct zcomp {		struct zcomp {
	struct zcomp_strm * __percpu *stream;		struct zcomp_strm * __percpu *stream;
	struct zcomp_backend *backend;
	struct notifier_block notifier;		struct notifier_block notifier;

	const char *name;		const char *name;

deleted100644 → 0

+0 −56

Original line number	Original line	Diff line number	Diff line
	/*
	* Copyright (C) 2014 Sergey Senozhatsky.
	*
	* This program is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License
	* as published by the Free Software Foundation; either version
	* 2 of the License, or (at your option) any later version.
	*/

	#include <linux/kernel.h>
	#include <linux/slab.h>
	#include <linux/lz4.h>
	#include <linux/vmalloc.h>
	#include <linux/mm.h>

	#include "zcomp_lz4.h"

	static void *zcomp_lz4_create(gfp_t flags)
	{
	void *ret;

	ret = kmalloc(LZ4_MEM_COMPRESS, flags);
	if (!ret)
	ret = __vmalloc(LZ4_MEM_COMPRESS,
	flags \| __GFP_HIGHMEM,
	PAGE_KERNEL);
	return ret;
	}

	static void zcomp_lz4_destroy(void *private)
	{
	kvfree(private);
	}

	static int zcomp_lz4_compress(const unsigned char src, unsigned char dst,
	size_t dst_len, void private)
	{
	/* return : Success if return 0 */
	return lz4_compress(src, PAGE_SIZE, dst, dst_len, private);
	}

	static int zcomp_lz4_decompress(const unsigned char *src, size_t src_len,
	unsigned char *dst)
	{
	size_t dst_len = PAGE_SIZE;
	/* return : Success if return 0 */
	return lz4_decompress_unknownoutputsize(src, src_len, dst, &dst_len);
	}

	struct zcomp_backend zcomp_lz4 = {
	.compress = zcomp_lz4_compress,
	.decompress = zcomp_lz4_decompress,
	.create = zcomp_lz4_create,
	.destroy = zcomp_lz4_destroy,
	.name = "lz4",
	};