Skip to content

Commit

Permalink
ramster: switch over to zsmalloc and crypto interface
Browse files Browse the repository at this point in the history
RAMster does many zcache-like things.  In order to avoid major
merge conflicts at 3.4, ramster used lzo1x directly for compression
and retained a local copy of xvmalloc, while zcache moved to the
new zsmalloc allocator and the crypto API.

This patch moves ramster forward to use zsmalloc and crypto.

Signed-off-by: Dan Magenheimer <dan.magenheimer@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Dan Magenheimer authored and Greg Kroah-Hartman committed May 14, 2012
1 parent c15974e commit 49b81a3
Show file tree
Hide file tree
Showing 7 changed files with 199 additions and 735 deletions.
6 changes: 3 additions & 3 deletions drivers/staging/ramster/Kconfig
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
config RAMSTER
bool "Cross-machine RAM capacity sharing, aka peer-to-peer tmem"
depends on (CLEANCACHE || FRONTSWAP) && CONFIGFS_FS=y && !ZCACHE && !XVMALLOC && !HIGHMEM && NET
select LZO_COMPRESS
select LZO_DECOMPRESS
depends on (CLEANCACHE || FRONTSWAP) && CONFIGFS_FS=y && !ZCACHE && CRYPTO=y && !HIGHMEM && NET
select ZSMALLOC
select CRYPTO_LZO
default n
help
RAMster allows RAM on other machines in a cluster to be utilized
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/ramster/Makefile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
obj-$(CONFIG_RAMSTER) += zcache-main.o tmem.o r2net.o xvmalloc.o cluster/
obj-$(CONFIG_RAMSTER) += zcache-main.o tmem.o r2net.o cluster/
4 changes: 1 addition & 3 deletions drivers/staging/ramster/TODO
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
For this staging driver, RAMster duplicates code from drivers/staging/zcache
then incorporates changes to the local copy of the code. For V5, it also
directly incorporates the soon-to-be-removed drivers/staging/zram/xvmalloc.[ch]
as all testing has been done with xvmalloc rather than the new zsmalloc.
then incorporates changes to the local copy of the code.
Before RAMster can be promoted from staging, the zcache and RAMster drivers
should be either merged or reorganized to separate out common code.

Expand Down
Loading

0 comments on commit 49b81a3

Please sign in to comment.