Staging: Rename ramzswap files to zram

Related changes:
 - Modify revelant Kconfig and Makefile accordingly.
 - Change include filenames in code.
 - Remove dependency on CONFIG_SWAP in Kconfig as zram usage
is no longer limited to swap disks.

Signed-off-by: Nitin Gupta <ngupta@vflare.org>
Acked-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index d5b827ccecf8d0a3e3a879871c5ef7e1910a82e7..cdd3ea348319f3ffff37a0956a1dfc164049d1d9 100644 (file)
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -119,7 +119,7 @@ source "drivers/staging/sep/Kconfig"
 
 source "drivers/staging/iio/Kconfig"
 
-source "drivers/staging/ramzswap/Kconfig"
+source "drivers/staging/zram/Kconfig"
 
 source "drivers/staging/wlags49_h2/Kconfig"
 

diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 2c14f89387be6736a0557cd4248446f45887c202..beceaff3dfdf0a294feeb98682a38260c727d21b 100644 (file)
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -40,7 +40,7 @@ obj-$(CONFIG_RAR_REGISTER)    += rar_register/
 obj-$(CONFIG_MRST_RAR_HANDLER) += memrar/
 obj-$(CONFIG_DX_SEP)           += sep/
 obj-$(CONFIG_IIO)              += iio/
-obj-$(CONFIG_RAMZSWAP)         += ramzswap/
+obj-$(CONFIG_ZRAM)             += zram/
 obj-$(CONFIG_WLAGS49_H2)       += wlags49_h2/
 obj-$(CONFIG_WLAGS49_H25)      += wlags49_h25/
 obj-$(CONFIG_BATMAN_ADV)       += batman-adv/

diff --git a/drivers/staging/ramzswap/Kconfig b/drivers/staging/ramzswap/Kconfig
deleted file mode 100644 (file)
index 127b3c6..0000000
--- a/drivers/staging/ramzswap/Kconfig
+++ /dev/null
@@ -1,21 +0,0 @@
-config RAMZSWAP
-       tristate "Compressed in-memory swap device (ramzswap)"
-       depends on SWAP
-       select LZO_COMPRESS
-       select LZO_DECOMPRESS
-       default n
-       help
-         Creates virtual block devices which can (only) be used as swap
-         disks. Pages swapped to these disks are compressed and stored in
-         memory itself.
-
-         See ramzswap.txt for more information.
-         Project home: http://compcache.googlecode.com/
-
-config RAMZSWAP_STATS
-       bool "Enable ramzswap stats"
-       depends on RAMZSWAP
-       default y
-       help
-         Enable statistics collection for ramzswap. This adds only a minimal
-         overhead. In unsure, say Y.

diff --git a/drivers/staging/ramzswap/Makefile b/drivers/staging/ramzswap/Makefile
deleted file mode 100644 (file)
index 507d7dc..0000000
--- a/drivers/staging/ramzswap/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-ramzswap-objs  :=      ramzswap_drv.o xvmalloc.o
-
-obj-$(CONFIG_RAMZSWAP) +=      ramzswap.o

diff --git a/drivers/staging/zram/Kconfig b/drivers/staging/zram/Kconfig
new file mode 100644 (file)
index 0000000..5bcfe16
--- /dev/null
+++ b/drivers/staging/zram/Kconfig
@@ -0,0 +1,28 @@
+config ZRAM
+       tristate "Compressed RAM block device support"
+       select LZO_COMPRESS
+       select LZO_DECOMPRESS
+       default n
+       help
+         Creates virtual block devices called /dev/zramX (X = 0, 1, ...).
+         Pages written to these disks are compressed and stored in memory
+         itself. These disks allow very fast I/O and compression provides
+         good amounts of memory savings.
+
+         It has several use cases, for example: /tmp storage, use as swap
+         disks and maybe many more.
+
+         See zram.txt for more information.
+         Project home: http://compcache.googlecode.com/
+
+config ZRAM_STATS
+       bool "Enable statistics for compressed RAM disks"
+       depends on ZRAM
+       default y
+       help
+         Enable statistics collection for compressed RAM devices. Statistics
+         are exported through ioctl interface, so you have to use zramconfig
+         program to get them. This adds only a minimal overhead.
+
+         If unsure, say Y.
+

diff --git a/drivers/staging/zram/Makefile b/drivers/staging/zram/Makefile
new file mode 100644 (file)
index 0000000..b2c087a
--- /dev/null
+++ b/drivers/staging/zram/Makefile
@@ -0,0 +1,3 @@
+zram-objs      :=      zram_drv.o xvmalloc.o
+
+obj-$(CONFIG_ZRAM)     +=      zram.o

diff --git a/drivers/staging/ramzswap/xvmalloc.c b/drivers/staging/zram/xvmalloc.c
similarity index 100%
rename from drivers/staging/ramzswap/xvmalloc.c
rename to drivers/staging/zram/xvmalloc.c

diff --git a/drivers/staging/ramzswap/xvmalloc.h b/drivers/staging/zram/xvmalloc.h
similarity index 100%
rename from drivers/staging/ramzswap/xvmalloc.h
rename to drivers/staging/zram/xvmalloc.h

diff --git a/drivers/staging/ramzswap/xvmalloc_int.h b/drivers/staging/zram/xvmalloc_int.h
similarity index 100%
rename from drivers/staging/ramzswap/xvmalloc_int.h
rename to drivers/staging/zram/xvmalloc_int.h

diff --git a/drivers/staging/ramzswap/ramzswap.txt b/drivers/staging/zram/zram.txt
similarity index 100%
rename from drivers/staging/ramzswap/ramzswap.txt
rename to drivers/staging/zram/zram.txt

diff --git a/drivers/staging/ramzswap/ramzswap_drv.c b/drivers/staging/zram/zram_drv.c
similarity index 99%
rename from drivers/staging/ramzswap/ramzswap_drv.c
rename to drivers/staging/zram/zram_drv.c
index 7b5cc61b3d697adc6854d1619bf8bfe3f133a708..e9b064c21484453c0e40f1835d7fa1f2ed3433ce 100644 (file)
--- a/drivers/staging/ramzswap/ramzswap_drv.c
+++ b/drivers/staging/zram/zram_drv.c
@@ -30,7 +30,7 @@
 #include <linux/swapops.h>
 #include <linux/vmalloc.h>
 
-#include "ramzswap_drv.h"
+#include "zram_drv.h"
 
 /* Globals */
 static int ramzswap_major;

diff --git a/drivers/staging/ramzswap/ramzswap_drv.h b/drivers/staging/zram/zram_drv.h
similarity index 99%
rename from drivers/staging/ramzswap/ramzswap_drv.h
rename to drivers/staging/zram/zram_drv.h
index ad91726013bb34307672460fbfb1de7c005c895c..4d2e48a23474516fe85bed820161b18fdc2abef9 100644 (file)
--- a/drivers/staging/ramzswap/ramzswap_drv.h
+++ b/drivers/staging/zram/zram_drv.h
@@ -18,7 +18,7 @@
 #include <linux/spinlock.h>
 #include <linux/mutex.h>
 
-#include "ramzswap_ioctl.h"
+#include "zram_ioctl.h"
 #include "xvmalloc.h"
 
 /*

diff --git a/drivers/staging/ramzswap/ramzswap_ioctl.h b/drivers/staging/zram/zram_ioctl.h
similarity index 100%
rename from drivers/staging/ramzswap/ramzswap_ioctl.h
rename to drivers/staging/zram/zram_ioctl.h