* [PATCH 4/5] staging: zcache: re-enable config/build of zcache after renaming
2013-01-17 17:26 [PATCH " Dan Magenheimer
@ 2013-01-17 17:26 ` Dan Magenheimer
0 siblings, 0 replies; 11+ messages in thread
From: Dan Magenheimer @ 2013-01-17 17:26 UTC (permalink / raw)
To: devel, linux-kernel, gregkh, linux-mm, ngupta, konrad.wilk,
sjenning, minchan, dan.magenheimer
In staging, re-enable config/build of zcache after ramster->zcache renaming.
Signed-off-by: Dan Magenheimer <dan.magenheimer@oracle.com>
---
drivers/staging/Kconfig | 2 ++
drivers/staging/Makefile | 1 +
2 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index eb61455..0b47a06 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -138,4 +138,6 @@ source "drivers/staging/sb105x/Kconfig"
source "drivers/staging/fwserial/Kconfig"
+source "drivers/staging/zcache/Kconfig"
+
endif # STAGING
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 18420b8..b026ea3 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -61,3 +61,4 @@ obj-$(CONFIG_DRM_IMX) += imx-drm/
obj-$(CONFIG_DGRP) += dgrp/
obj-$(CONFIG_SB105X) += sb105x/
obj-$(CONFIG_FIREWIRE_SERIAL) += fwserial/
+obj-$(CONFIG_ZCACHE) += zcache/
--
1.7.1
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH V2 0/5] staging: zcache: move new zcache code base from ramster
@ 2013-01-18 21:24 Dan Magenheimer
2013-01-18 21:24 ` [PATCH 1/5] staging: ramster: disable build in anticipation of renaming Dan Magenheimer
` (6 more replies)
0 siblings, 7 replies; 11+ messages in thread
From: Dan Magenheimer @ 2013-01-18 21:24 UTC (permalink / raw)
To: devel, linux-kernel, gregkh, linux-mm, ngupta, konrad.wilk,
sjenning, minchan, dan.magenheimer
[V2: no code changes, patchset now generated via git format-patch -M]
Hi Greg --
With "old zcache" now removed, we can now move "new zcache" from its
temporary home (in drivers/staging/ramster) to reclaim sole possession
of the name "zcache".
(Note that [PATCH 2/5] is just a git mv.)
This patchset should apply cleanly to staging-next.
Thanks,
Dan
Signed-off-by: Dan Magenheimer <dan.magenheimer@oracle.com>
---
Diffstat:
drivers/staging/Kconfig | 4 +-
drivers/staging/Makefile | 2 +-
drivers/staging/ramster/Kconfig | 31 -
drivers/staging/ramster/Makefile | 6 -
drivers/staging/ramster/ramster.h | 59 -
drivers/staging/ramster/ramster/heartbeat.c | 462 ----
drivers/staging/ramster/ramster/heartbeat.h | 87 -
drivers/staging/ramster/ramster/masklog.c | 155 --
drivers/staging/ramster/ramster/masklog.h | 220 --
drivers/staging/ramster/ramster/nodemanager.c | 995 ---------
drivers/staging/ramster/ramster/nodemanager.h | 88 -
drivers/staging/ramster/ramster/r2net.c | 414 ----
drivers/staging/ramster/ramster/ramster.c | 985 ---------
drivers/staging/ramster/ramster/ramster.h | 161 --
.../staging/ramster/ramster/ramster_nodemanager.h | 39 -
drivers/staging/ramster/ramster/tcp.c | 2253 --------------------
drivers/staging/ramster/ramster/tcp.h | 159 --
drivers/staging/ramster/ramster/tcp_internal.h | 248 ---
drivers/staging/ramster/tmem.c | 894 --------
drivers/staging/ramster/tmem.h | 259 ---
drivers/staging/ramster/zbud.c | 1060 ---------
drivers/staging/ramster/zbud.h | 33 -
drivers/staging/ramster/zcache-main.c | 1820 ----------------
drivers/staging/ramster/zcache.h | 53 -
drivers/staging/zcache/Kconfig | 26 +
drivers/staging/zcache/Makefile | 6 +
drivers/staging/zcache/ramster.h | 59 +
drivers/staging/zcache/ramster/heartbeat.c | 462 ++++
drivers/staging/zcache/ramster/heartbeat.h | 87 +
drivers/staging/zcache/ramster/masklog.c | 155 ++
drivers/staging/zcache/ramster/masklog.h | 220 ++
drivers/staging/zcache/ramster/nodemanager.c | 995 +++++++++
drivers/staging/zcache/ramster/nodemanager.h | 88 +
drivers/staging/zcache/ramster/r2net.c | 414 ++++
drivers/staging/zcache/ramster/ramster.c | 985 +++++++++
drivers/staging/zcache/ramster/ramster.h | 161 ++
.../staging/zcache/ramster/ramster_nodemanager.h | 39 +
drivers/staging/zcache/ramster/tcp.c | 2253 ++++++++++++++++++++
drivers/staging/zcache/ramster/tcp.h | 159 ++
drivers/staging/zcache/ramster/tcp_internal.h | 248 +++
drivers/staging/zcache/tmem.c | 894 ++++++++
drivers/staging/zcache/tmem.h | 259 +++
drivers/staging/zcache/zbud.c | 1060 +++++++++
drivers/staging/zcache/zbud.h | 33 +
drivers/staging/zcache/zcache-main.c | 1820 ++++++++++++++++
drivers/staging/zcache/zcache.h | 53 +
46 files changed, 10479 insertions(+), 10484 deletions(-)
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 1/5] staging: ramster: disable build in anticipation of renaming
2013-01-18 21:24 [PATCH V2 0/5] staging: zcache: move new zcache code base from ramster Dan Magenheimer
@ 2013-01-18 21:24 ` Dan Magenheimer
2013-01-18 21:24 ` [PATCH 2/5] staging: zcache: rename ramster to zcache Dan Magenheimer
` (5 subsequent siblings)
6 siblings, 0 replies; 11+ messages in thread
From: Dan Magenheimer @ 2013-01-18 21:24 UTC (permalink / raw)
To: devel, linux-kernel, gregkh, linux-mm, ngupta, konrad.wilk,
sjenning, minchan, dan.magenheimer
[V2: no code changes, patchset now generated via git format-patch -M]
In staging, disable ramster build in anticipation of renaming to zcache
Signed-off-by: Dan Magenheimer <dan.magenheimer@oracle.com>
---
drivers/staging/Kconfig | 2 --
drivers/staging/Makefile | 1 -
2 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index db8a512..eb61455 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -126,8 +126,6 @@ source "drivers/staging/csr/Kconfig"
source "drivers/staging/omap-thermal/Kconfig"
-source "drivers/staging/ramster/Kconfig"
-
source "drivers/staging/silicom/Kconfig"
source "drivers/staging/ced1401/Kconfig"
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index a9d5479..18420b8 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -55,7 +55,6 @@ obj-$(CONFIG_USB_G_CCG) += ccg/
obj-$(CONFIG_WIMAX_GDM72XX) += gdm72xx/
obj-$(CONFIG_CSR_WIFI) += csr/
obj-$(CONFIG_OMAP_BANDGAP) += omap-thermal/
-obj-$(CONFIG_ZCACHE2) += ramster/
obj-$(CONFIG_NET_VENDOR_SILICOM) += silicom/
obj-$(CONFIG_CED1401) += ced1401/
obj-$(CONFIG_DRM_IMX) += imx-drm/
--
1.7.1
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 2/5] staging: zcache: rename ramster to zcache
2013-01-18 21:24 [PATCH V2 0/5] staging: zcache: move new zcache code base from ramster Dan Magenheimer
2013-01-18 21:24 ` [PATCH 1/5] staging: ramster: disable build in anticipation of renaming Dan Magenheimer
@ 2013-01-18 21:24 ` Dan Magenheimer
2013-01-19 19:57 ` Dan Carpenter
2013-01-18 21:24 ` [PATCH 3/5] staging: zcache: adjustments to config/build files due to renaming Dan Magenheimer
` (4 subsequent siblings)
6 siblings, 1 reply; 11+ messages in thread
From: Dan Magenheimer @ 2013-01-18 21:24 UTC (permalink / raw)
To: devel, linux-kernel, gregkh, linux-mm, ngupta, konrad.wilk,
sjenning, minchan, dan.magenheimer
[V2: no code changes, patchset now generated via git format-patch -M]
In staging, rename ramster to zcache
The original zcache in staging was a "demo" version, and this new zcache
is a significant rewrite. While certain disagreements were being resolved,
both "old zcache" and "new zcache" needed to reside in the staging tree
simultaneously. In order to minimize code change and churn, the newer
version of zcache was temporarily merged into the "ramster" staging driver
which, prior to that, had at one time heavily leveraged the older version
of zcache. So, recently, "new zcache" resided in the ramster directory.
Got that? No? Sorry, temporary political compromises are rarely pretty.
The older version of zcache is no longer being maintained and has now
been removed from the staging tree. So now the newer version of zcache
can rightfully reclaim sole possession of the name "zcache".
FYI, this [PATCH 2/5] is simply a "git mv" generated by "git format-patch -M".
Signed-off-by: Dan Magenheimer <dan.magenheimer@oracle.com>
---
drivers/staging/{ramster => zcache}/Kconfig | 0
drivers/staging/{ramster => zcache}/Makefile | 0
drivers/staging/{ramster => zcache}/ramster.h | 0
.../{ramster => zcache}/ramster/heartbeat.c | 0
.../{ramster => zcache}/ramster/heartbeat.h | 0
.../staging/{ramster => zcache}/ramster/masklog.c | 0
.../staging/{ramster => zcache}/ramster/masklog.h | 0
.../{ramster => zcache}/ramster/nodemanager.c | 0
.../{ramster => zcache}/ramster/nodemanager.h | 0
.../staging/{ramster => zcache}/ramster/r2net.c | 0
.../staging/{ramster => zcache}/ramster/ramster.c | 0
.../staging/{ramster => zcache}/ramster/ramster.h | 0
.../ramster/ramster_nodemanager.h | 0
drivers/staging/{ramster => zcache}/ramster/tcp.c | 0
drivers/staging/{ramster => zcache}/ramster/tcp.h | 0
.../{ramster => zcache}/ramster/tcp_internal.h | 0
drivers/staging/{ramster => zcache}/tmem.c | 0
drivers/staging/{ramster => zcache}/tmem.h | 0
drivers/staging/{ramster => zcache}/zbud.c | 0
drivers/staging/{ramster => zcache}/zbud.h | 0
drivers/staging/{ramster => zcache}/zcache-main.c | 0
drivers/staging/{ramster => zcache}/zcache.h | 0
22 files changed, 0 insertions(+), 0 deletions(-)
rename drivers/staging/{ramster => zcache}/Kconfig (100%)
rename drivers/staging/{ramster => zcache}/Makefile (100%)
rename drivers/staging/{ramster => zcache}/ramster.h (100%)
rename drivers/staging/{ramster => zcache}/ramster/heartbeat.c (100%)
rename drivers/staging/{ramster => zcache}/ramster/heartbeat.h (100%)
rename drivers/staging/{ramster => zcache}/ramster/masklog.c (100%)
rename drivers/staging/{ramster => zcache}/ramster/masklog.h (100%)
rename drivers/staging/{ramster => zcache}/ramster/nodemanager.c (100%)
rename drivers/staging/{ramster => zcache}/ramster/nodemanager.h (100%)
rename drivers/staging/{ramster => zcache}/ramster/r2net.c (100%)
rename drivers/staging/{ramster => zcache}/ramster/ramster.c (100%)
rename drivers/staging/{ramster => zcache}/ramster/ramster.h (100%)
rename drivers/staging/{ramster => zcache}/ramster/ramster_nodemanager.h (100%)
rename drivers/staging/{ramster => zcache}/ramster/tcp.c (100%)
rename drivers/staging/{ramster => zcache}/ramster/tcp.h (100%)
rename drivers/staging/{ramster => zcache}/ramster/tcp_internal.h (100%)
rename drivers/staging/{ramster => zcache}/tmem.c (100%)
rename drivers/staging/{ramster => zcache}/tmem.h (100%)
rename drivers/staging/{ramster => zcache}/zbud.c (100%)
rename drivers/staging/{ramster => zcache}/zbud.h (100%)
rename drivers/staging/{ramster => zcache}/zcache-main.c (100%)
rename drivers/staging/{ramster => zcache}/zcache.h (100%)
diff --git a/drivers/staging/ramster/Kconfig b/drivers/staging/zcache/Kconfig
similarity index 100%
rename from drivers/staging/ramster/Kconfig
rename to drivers/staging/zcache/Kconfig
diff --git a/drivers/staging/ramster/Makefile b/drivers/staging/zcache/Makefile
similarity index 100%
rename from drivers/staging/ramster/Makefile
rename to drivers/staging/zcache/Makefile
diff --git a/drivers/staging/ramster/ramster.h b/drivers/staging/zcache/ramster.h
similarity index 100%
rename from drivers/staging/ramster/ramster.h
rename to drivers/staging/zcache/ramster.h
diff --git a/drivers/staging/ramster/ramster/heartbeat.c b/drivers/staging/zcache/ramster/heartbeat.c
similarity index 100%
rename from drivers/staging/ramster/ramster/heartbeat.c
rename to drivers/staging/zcache/ramster/heartbeat.c
diff --git a/drivers/staging/ramster/ramster/heartbeat.h b/drivers/staging/zcache/ramster/heartbeat.h
similarity index 100%
rename from drivers/staging/ramster/ramster/heartbeat.h
rename to drivers/staging/zcache/ramster/heartbeat.h
diff --git a/drivers/staging/ramster/ramster/masklog.c b/drivers/staging/zcache/ramster/masklog.c
similarity index 100%
rename from drivers/staging/ramster/ramster/masklog.c
rename to drivers/staging/zcache/ramster/masklog.c
diff --git a/drivers/staging/ramster/ramster/masklog.h b/drivers/staging/zcache/ramster/masklog.h
similarity index 100%
rename from drivers/staging/ramster/ramster/masklog.h
rename to drivers/staging/zcache/ramster/masklog.h
diff --git a/drivers/staging/ramster/ramster/nodemanager.c b/drivers/staging/zcache/ramster/nodemanager.c
similarity index 100%
rename from drivers/staging/ramster/ramster/nodemanager.c
rename to drivers/staging/zcache/ramster/nodemanager.c
diff --git a/drivers/staging/ramster/ramster/nodemanager.h b/drivers/staging/zcache/ramster/nodemanager.h
similarity index 100%
rename from drivers/staging/ramster/ramster/nodemanager.h
rename to drivers/staging/zcache/ramster/nodemanager.h
diff --git a/drivers/staging/ramster/ramster/r2net.c b/drivers/staging/zcache/ramster/r2net.c
similarity index 100%
rename from drivers/staging/ramster/ramster/r2net.c
rename to drivers/staging/zcache/ramster/r2net.c
diff --git a/drivers/staging/ramster/ramster/ramster.c b/drivers/staging/zcache/ramster/ramster.c
similarity index 100%
rename from drivers/staging/ramster/ramster/ramster.c
rename to drivers/staging/zcache/ramster/ramster.c
diff --git a/drivers/staging/ramster/ramster/ramster.h b/drivers/staging/zcache/ramster/ramster.h
similarity index 100%
rename from drivers/staging/ramster/ramster/ramster.h
rename to drivers/staging/zcache/ramster/ramster.h
diff --git a/drivers/staging/ramster/ramster/ramster_nodemanager.h b/drivers/staging/zcache/ramster/ramster_nodemanager.h
similarity index 100%
rename from drivers/staging/ramster/ramster/ramster_nodemanager.h
rename to drivers/staging/zcache/ramster/ramster_nodemanager.h
diff --git a/drivers/staging/ramster/ramster/tcp.c b/drivers/staging/zcache/ramster/tcp.c
similarity index 100%
rename from drivers/staging/ramster/ramster/tcp.c
rename to drivers/staging/zcache/ramster/tcp.c
diff --git a/drivers/staging/ramster/ramster/tcp.h b/drivers/staging/zcache/ramster/tcp.h
similarity index 100%
rename from drivers/staging/ramster/ramster/tcp.h
rename to drivers/staging/zcache/ramster/tcp.h
diff --git a/drivers/staging/ramster/ramster/tcp_internal.h b/drivers/staging/zcache/ramster/tcp_internal.h
similarity index 100%
rename from drivers/staging/ramster/ramster/tcp_internal.h
rename to drivers/staging/zcache/ramster/tcp_internal.h
diff --git a/drivers/staging/ramster/tmem.c b/drivers/staging/zcache/tmem.c
similarity index 100%
rename from drivers/staging/ramster/tmem.c
rename to drivers/staging/zcache/tmem.c
diff --git a/drivers/staging/ramster/tmem.h b/drivers/staging/zcache/tmem.h
similarity index 100%
rename from drivers/staging/ramster/tmem.h
rename to drivers/staging/zcache/tmem.h
diff --git a/drivers/staging/ramster/zbud.c b/drivers/staging/zcache/zbud.c
similarity index 100%
rename from drivers/staging/ramster/zbud.c
rename to drivers/staging/zcache/zbud.c
diff --git a/drivers/staging/ramster/zbud.h b/drivers/staging/zcache/zbud.h
similarity index 100%
rename from drivers/staging/ramster/zbud.h
rename to drivers/staging/zcache/zbud.h
diff --git a/drivers/staging/ramster/zcache-main.c b/drivers/staging/zcache/zcache-main.c
similarity index 100%
rename from drivers/staging/ramster/zcache-main.c
rename to drivers/staging/zcache/zcache-main.c
diff --git a/drivers/staging/ramster/zcache.h b/drivers/staging/zcache/zcache.h
similarity index 100%
rename from drivers/staging/ramster/zcache.h
rename to drivers/staging/zcache/zcache.h
--
1.7.1
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 3/5] staging: zcache: adjustments to config/build files due to renaming
2013-01-18 21:24 [PATCH V2 0/5] staging: zcache: move new zcache code base from ramster Dan Magenheimer
2013-01-18 21:24 ` [PATCH 1/5] staging: ramster: disable build in anticipation of renaming Dan Magenheimer
2013-01-18 21:24 ` [PATCH 2/5] staging: zcache: rename ramster to zcache Dan Magenheimer
@ 2013-01-18 21:24 ` Dan Magenheimer
2013-01-18 21:24 ` [PATCH 4/5] staging: zcache: re-enable config/build of zcache after renaming Dan Magenheimer
` (3 subsequent siblings)
6 siblings, 0 replies; 11+ messages in thread
From: Dan Magenheimer @ 2013-01-18 21:24 UTC (permalink / raw)
To: devel, linux-kernel, gregkh, linux-mm, ngupta, konrad.wilk,
sjenning, minchan, dan.magenheimer
[V2: no code changes, patchset now generated via git format-patch -M]
In staging/zcache, adjust config/build due to ramster->zcache renaming
Signed-off-by: Dan Magenheimer <dan.magenheimer@oracle.com>
---
drivers/staging/zcache/Kconfig | 17 ++++++-----------
drivers/staging/zcache/Makefile | 2 +-
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/zcache/Kconfig b/drivers/staging/zcache/Kconfig
index 3abf661..c1dbd04 100644
--- a/drivers/staging/zcache/Kconfig
+++ b/drivers/staging/zcache/Kconfig
@@ -1,23 +1,18 @@
-config ZCACHE2
+config ZCACHE
bool "Dynamic compression of swap pages and clean pagecache pages"
- depends on CRYPTO=y && SWAP=y && CLEANCACHE && FRONTSWAP && !ZCACHE
+ depends on CRYPTO=y && SWAP=y && CLEANCACHE && FRONTSWAP
select CRYPTO_LZO
default n
help
- Zcache2 doubles RAM efficiency while providing a significant
- performance boosts on many workloads. Zcache2 uses
+ Zcache doubles RAM efficiency while providing a significant
+ performance boosts on many workloads. Zcache uses
compression and an in-kernel implementation of transcendent
memory to store clean page cache pages and swap in RAM,
- providing a noticeable reduction in disk I/O. Zcache2
- is a complete rewrite of the older zcache; it was intended to
- be a merge but that has been blocked due to political and
- technical disagreements. It is intended that they will merge
- again in the future. Until then, zcache2 is a single-node
- version of ramster.
+ providing a noticeable reduction in disk I/O.
config RAMSTER
bool "Cross-machine RAM capacity sharing, aka peer-to-peer tmem"
- depends on CONFIGFS_FS=y && SYSFS=y && !HIGHMEM && ZCACHE2=y
+ depends on CONFIGFS_FS=y && SYSFS=y && !HIGHMEM && ZCACHE=y
depends on NET
# must ensure struct page is 8-byte aligned
select HAVE_ALIGNED_STRUCT_PAGE if !64_BIT
diff --git a/drivers/staging/zcache/Makefile b/drivers/staging/zcache/Makefile
index 2d8b9d0..4711049 100644
--- a/drivers/staging/zcache/Makefile
+++ b/drivers/staging/zcache/Makefile
@@ -3,4 +3,4 @@ zcache-$(CONFIG_RAMSTER) += ramster/ramster.o ramster/r2net.o
zcache-$(CONFIG_RAMSTER) += ramster/nodemanager.o ramster/tcp.o
zcache-$(CONFIG_RAMSTER) += ramster/heartbeat.o ramster/masklog.o
-obj-$(CONFIG_ZCACHE2) += zcache.o
+obj-$(CONFIG_ZCACHE) += zcache.o
--
1.7.1
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 4/5] staging: zcache: re-enable config/build of zcache after renaming
2013-01-18 21:24 [PATCH V2 0/5] staging: zcache: move new zcache code base from ramster Dan Magenheimer
` (2 preceding siblings ...)
2013-01-18 21:24 ` [PATCH 3/5] staging: zcache: adjustments to config/build files due to renaming Dan Magenheimer
@ 2013-01-18 21:24 ` Dan Magenheimer
2013-01-18 21:24 ` [PATCH 5/5] staging: zcache: fix uninitialized variable compile warning Dan Magenheimer
` (2 subsequent siblings)
6 siblings, 0 replies; 11+ messages in thread
From: Dan Magenheimer @ 2013-01-18 21:24 UTC (permalink / raw)
To: devel, linux-kernel, gregkh, linux-mm, ngupta, konrad.wilk,
sjenning, minchan, dan.magenheimer
In staging, re-enable config/build of zcache after ramster->zcache renaming.
Signed-off-by: Dan Magenheimer <dan.magenheimer@oracle.com>
---
drivers/staging/Kconfig | 2 ++
drivers/staging/Makefile | 1 +
2 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index eb61455..0b47a06 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -138,4 +138,6 @@ source "drivers/staging/sb105x/Kconfig"
source "drivers/staging/fwserial/Kconfig"
+source "drivers/staging/zcache/Kconfig"
+
endif # STAGING
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 18420b8..b026ea3 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -61,3 +61,4 @@ obj-$(CONFIG_DRM_IMX) += imx-drm/
obj-$(CONFIG_DGRP) += dgrp/
obj-$(CONFIG_SB105X) += sb105x/
obj-$(CONFIG_FIREWIRE_SERIAL) += fwserial/
+obj-$(CONFIG_ZCACHE) += zcache/
--
1.7.1
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 5/5] staging: zcache: fix uninitialized variable compile warning
2013-01-18 21:24 [PATCH V2 0/5] staging: zcache: move new zcache code base from ramster Dan Magenheimer
` (3 preceding siblings ...)
2013-01-18 21:24 ` [PATCH 4/5] staging: zcache: re-enable config/build of zcache after renaming Dan Magenheimer
@ 2013-01-18 21:24 ` Dan Magenheimer
2013-01-18 21:46 ` [PATCH V2 0/5] staging: zcache: move new zcache code base from ramster Greg KH
2013-01-18 21:56 ` Konrad Rzeszutek Wilk
6 siblings, 0 replies; 11+ messages in thread
From: Dan Magenheimer @ 2013-01-18 21:24 UTC (permalink / raw)
To: devel, linux-kernel, gregkh, linux-mm, ngupta, konrad.wilk,
sjenning, minchan, dan.magenheimer
[V2: no code changes, patchset now generated via git format-patch -M]
Fix unitialized variable in zcache which generates warning during build
Signed-off-by: Dan Magenheimer <dan.magenheimer@oracle.com>
---
drivers/staging/zcache/zcache-main.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/staging/zcache/zcache-main.c b/drivers/staging/zcache/zcache-main.c
index a09dd5c..6ab13e1 100644
--- a/drivers/staging/zcache/zcache-main.c
+++ b/drivers/staging/zcache/zcache-main.c
@@ -1346,7 +1346,7 @@ static int zcache_local_new_pool(uint32_t flags)
int zcache_autocreate_pool(unsigned int cli_id, unsigned int pool_id, bool eph)
{
struct tmem_pool *pool;
- struct zcache_client *cli;
+ struct zcache_client *cli = NULL;
uint32_t flags = eph ? 0 : TMEM_POOL_PERSIST;
int ret = -1;
--
1.7.1
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH V2 0/5] staging: zcache: move new zcache code base from ramster
2013-01-18 21:24 [PATCH V2 0/5] staging: zcache: move new zcache code base from ramster Dan Magenheimer
` (4 preceding siblings ...)
2013-01-18 21:24 ` [PATCH 5/5] staging: zcache: fix uninitialized variable compile warning Dan Magenheimer
@ 2013-01-18 21:46 ` Greg KH
2013-01-18 21:56 ` Konrad Rzeszutek Wilk
6 siblings, 0 replies; 11+ messages in thread
From: Greg KH @ 2013-01-18 21:46 UTC (permalink / raw)
To: Dan Magenheimer
Cc: devel, linux-kernel, linux-mm, ngupta, konrad.wilk, sjenning,
minchan
On Fri, Jan 18, 2013 at 01:24:22PM -0800, Dan Magenheimer wrote:
> [V2: no code changes, patchset now generated via git format-patch -M]
>
> Hi Greg --
>
> With "old zcache" now removed, we can now move "new zcache" from its
> temporary home (in drivers/staging/ramster) to reclaim sole possession
> of the name "zcache".
>
> (Note that [PATCH 2/5] is just a git mv.)
>
> This patchset should apply cleanly to staging-next.
Very nice, now applied, thanks.
greg k-h
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH V2 0/5] staging: zcache: move new zcache code base from ramster
2013-01-18 21:24 [PATCH V2 0/5] staging: zcache: move new zcache code base from ramster Dan Magenheimer
` (5 preceding siblings ...)
2013-01-18 21:46 ` [PATCH V2 0/5] staging: zcache: move new zcache code base from ramster Greg KH
@ 2013-01-18 21:56 ` Konrad Rzeszutek Wilk
6 siblings, 0 replies; 11+ messages in thread
From: Konrad Rzeszutek Wilk @ 2013-01-18 21:56 UTC (permalink / raw)
To: Dan Magenheimer
Cc: devel, linux-kernel, gregkh, linux-mm, ngupta, sjenning, minchan
On Fri, Jan 18, 2013 at 01:24:22PM -0800, Dan Magenheimer wrote:
> [V2: no code changes, patchset now generated via git format-patch -M]
>
> Hi Greg --
>
> With "old zcache" now removed, we can now move "new zcache" from its
> temporary home (in drivers/staging/ramster) to reclaim sole possession
> of the name "zcache".
>
> (Note that [PATCH 2/5] is just a git mv.)
>
> This patchset should apply cleanly to staging-next.
Sweet. Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
>
> Thanks,
> Dan
>
> Signed-off-by: Dan Magenheimer <dan.magenheimer@oracle.com>
>
> ---
> Diffstat:
>
> drivers/staging/Kconfig | 4 +-
> drivers/staging/Makefile | 2 +-
> drivers/staging/ramster/Kconfig | 31 -
> drivers/staging/ramster/Makefile | 6 -
> drivers/staging/ramster/ramster.h | 59 -
> drivers/staging/ramster/ramster/heartbeat.c | 462 ----
> drivers/staging/ramster/ramster/heartbeat.h | 87 -
> drivers/staging/ramster/ramster/masklog.c | 155 --
> drivers/staging/ramster/ramster/masklog.h | 220 --
> drivers/staging/ramster/ramster/nodemanager.c | 995 ---------
> drivers/staging/ramster/ramster/nodemanager.h | 88 -
> drivers/staging/ramster/ramster/r2net.c | 414 ----
> drivers/staging/ramster/ramster/ramster.c | 985 ---------
> drivers/staging/ramster/ramster/ramster.h | 161 --
> .../staging/ramster/ramster/ramster_nodemanager.h | 39 -
> drivers/staging/ramster/ramster/tcp.c | 2253 --------------------
> drivers/staging/ramster/ramster/tcp.h | 159 --
> drivers/staging/ramster/ramster/tcp_internal.h | 248 ---
> drivers/staging/ramster/tmem.c | 894 --------
> drivers/staging/ramster/tmem.h | 259 ---
> drivers/staging/ramster/zbud.c | 1060 ---------
> drivers/staging/ramster/zbud.h | 33 -
> drivers/staging/ramster/zcache-main.c | 1820 ----------------
> drivers/staging/ramster/zcache.h | 53 -
> drivers/staging/zcache/Kconfig | 26 +
> drivers/staging/zcache/Makefile | 6 +
> drivers/staging/zcache/ramster.h | 59 +
> drivers/staging/zcache/ramster/heartbeat.c | 462 ++++
> drivers/staging/zcache/ramster/heartbeat.h | 87 +
> drivers/staging/zcache/ramster/masklog.c | 155 ++
> drivers/staging/zcache/ramster/masklog.h | 220 ++
> drivers/staging/zcache/ramster/nodemanager.c | 995 +++++++++
> drivers/staging/zcache/ramster/nodemanager.h | 88 +
> drivers/staging/zcache/ramster/r2net.c | 414 ++++
> drivers/staging/zcache/ramster/ramster.c | 985 +++++++++
> drivers/staging/zcache/ramster/ramster.h | 161 ++
> .../staging/zcache/ramster/ramster_nodemanager.h | 39 +
> drivers/staging/zcache/ramster/tcp.c | 2253 ++++++++++++++++++++
> drivers/staging/zcache/ramster/tcp.h | 159 ++
> drivers/staging/zcache/ramster/tcp_internal.h | 248 +++
> drivers/staging/zcache/tmem.c | 894 ++++++++
> drivers/staging/zcache/tmem.h | 259 +++
> drivers/staging/zcache/zbud.c | 1060 +++++++++
> drivers/staging/zcache/zbud.h | 33 +
> drivers/staging/zcache/zcache-main.c | 1820 ++++++++++++++++
> drivers/staging/zcache/zcache.h | 53 +
> 46 files changed, 10479 insertions(+), 10484 deletions(-)
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 2/5] staging: zcache: rename ramster to zcache
2013-01-18 21:24 ` [PATCH 2/5] staging: zcache: rename ramster to zcache Dan Magenheimer
@ 2013-01-19 19:57 ` Dan Carpenter
2013-01-22 17:04 ` Dan Magenheimer
0 siblings, 1 reply; 11+ messages in thread
From: Dan Carpenter @ 2013-01-19 19:57 UTC (permalink / raw)
To: Dan Magenheimer
Cc: devel, linux-kernel, gregkh, linux-mm, ngupta, konrad.wilk,
sjenning, minchan
On Fri, Jan 18, 2013 at 01:24:24PM -0800, Dan Magenheimer wrote:
> [V2: no code changes, patchset now generated via git format-patch -M]
If you put these comments below the --- cut off line (together with
the diffstat) then "git am" won't add them to the commit log.
regards,
dan carpenter
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply [flat|nested] 11+ messages in thread
* RE: [PATCH 2/5] staging: zcache: rename ramster to zcache
2013-01-19 19:57 ` Dan Carpenter
@ 2013-01-22 17:04 ` Dan Magenheimer
0 siblings, 0 replies; 11+ messages in thread
From: Dan Magenheimer @ 2013-01-22 17:04 UTC (permalink / raw)
To: Dan Carpenter
Cc: devel, linux-kernel, gregkh, linux-mm, ngupta, Konrad Wilk,
sjenning, minchan
> From: Dan Carpenter
> Sent: Saturday, January 19, 2013 12:57 PM
> To: Dan Magenheimer
> Cc: devel@linuxdriverproject.org; linux-kernel@vger.kernel.org; gregkh@linuxfoundation.org; linux-
> mm@kvack.org; ngupta@vflare.org; Konrad Wilk; sjenning@linux.vnet.ibm.com; minchan@kernel.org
> Subject: Re: [PATCH 2/5] staging: zcache: rename ramster to zcache
>
> On Fri, Jan 18, 2013 at 01:24:24PM -0800, Dan Magenheimer wrote:
> > [V2: no code changes, patchset now generated via git format-patch -M]
>
> If you put these comments below the --- cut off line (together with
> the diffstat) then "git am" won't add them to the commit log.
>
> regards,
> dan carpenter
Will do next time. Thanks for the pointer!
Dan
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2013-01-22 17:04 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-18 21:24 [PATCH V2 0/5] staging: zcache: move new zcache code base from ramster Dan Magenheimer
2013-01-18 21:24 ` [PATCH 1/5] staging: ramster: disable build in anticipation of renaming Dan Magenheimer
2013-01-18 21:24 ` [PATCH 2/5] staging: zcache: rename ramster to zcache Dan Magenheimer
2013-01-19 19:57 ` Dan Carpenter
2013-01-22 17:04 ` Dan Magenheimer
2013-01-18 21:24 ` [PATCH 3/5] staging: zcache: adjustments to config/build files due to renaming Dan Magenheimer
2013-01-18 21:24 ` [PATCH 4/5] staging: zcache: re-enable config/build of zcache after renaming Dan Magenheimer
2013-01-18 21:24 ` [PATCH 5/5] staging: zcache: fix uninitialized variable compile warning Dan Magenheimer
2013-01-18 21:46 ` [PATCH V2 0/5] staging: zcache: move new zcache code base from ramster Greg KH
2013-01-18 21:56 ` Konrad Rzeszutek Wilk
-- strict thread matches above, loose matches on Subject: below --
2013-01-17 17:26 [PATCH " Dan Magenheimer
2013-01-17 17:26 ` [PATCH 4/5] staging: zcache: re-enable config/build of zcache after renaming Dan Magenheimer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).