From: Konrad Rzeszutek Wilk <konrad@kernel.org>
To: dan.magenheimer@oracle.com, konrad.wilk@oracle.com,
sjenning@linux.vnet.ibm.com, gregkh@linuxfoundation.org,
rcj@linux.vnet.ibm.com, linux-kernel@vger.kernel.org,
devel@driverdev.osuosl.org
Subject: [PATCH 11/16] zcache/debug: Coalesce all debug under CONFIG_ZCACHE_DEBUG
Date: Fri, 1 Feb 2013 15:52:14 -0500 [thread overview]
Message-ID: <1359751939-23584-12-git-send-email-konrad.wilk@oracle.com> (raw)
In-Reply-To: <1359751939-23584-1-git-send-email-konrad.wilk@oracle.com>
and also define this extra attribute in the Kconfig entry.
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---
drivers/staging/zcache/Kconfig | 8 ++++++++
drivers/staging/zcache/debug.c | 2 +-
drivers/staging/zcache/zcache-main.c | 6 +++---
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/zcache/Kconfig b/drivers/staging/zcache/Kconfig
index 88e3c59..f2a13ac 100644
--- a/drivers/staging/zcache/Kconfig
+++ b/drivers/staging/zcache/Kconfig
@@ -10,6 +10,14 @@ config ZCACHE
memory to store clean page cache pages and swap in RAM,
providing a noticeable reduction in disk I/O.
+config ZCACHE_DEBUG
+ bool "Enable debug statistics"
+ depends on DEBUG_FS && ZCACHE
+ default n
+ help
+ This is used to provide an debugfs directory with counters of
+ how zcache is doing. You probably want to set this to 'N'.
+
config RAMSTER
tristate "Cross-machine RAM capacity sharing, aka peer-to-peer tmem"
depends on CONFIGFS_FS=y && SYSFS=y && !HIGHMEM && ZCACHE
diff --git a/drivers/staging/zcache/debug.c b/drivers/staging/zcache/debug.c
index 34c4023..1485eef 100644
--- a/drivers/staging/zcache/debug.c
+++ b/drivers/staging/zcache/debug.c
@@ -1,7 +1,7 @@
#include <linux/atomic.h>
#include "debug.h"
-#ifdef CONFIG_DEBUG_FS
+#ifdef CONFIG_ZCACHE_DEBUG
#include <linux/debugfs.h>
#define ATTR(x) { .name = #x, .val = &zcache_##x, }
diff --git a/drivers/staging/zcache/zcache-main.c b/drivers/staging/zcache/zcache-main.c
index 8830359..99fd59f 100644
--- a/drivers/staging/zcache/zcache-main.c
+++ b/drivers/staging/zcache/zcache-main.c
@@ -308,7 +308,7 @@ static void zcache_free_page(struct page *page)
max_pageframes = curr_pageframes;
if (curr_pageframes < min_pageframes)
min_pageframes = curr_pageframes;
-#ifdef ZCACHE_DEBUG
+#ifdef CONFIG_ZCACHE_DEBUG
if (curr_pageframes > 2L || curr_pageframes < -2L) {
/* pr_info here */
}
@@ -1602,7 +1602,7 @@ static int zcache_init(void)
old_ops = zcache_cleancache_register_ops();
pr_info("%s: cleancache enabled using kernel transcendent "
"memory and compression buddies\n", namestr);
-#ifdef ZCACHE_DEBUG
+#ifdef CONFIG_ZCACHE_DEBUG
pr_info("%s: cleancache: ignorenonactive = %d\n",
namestr, !disable_cleancache_ignore_nonactive);
#endif
@@ -1617,7 +1617,7 @@ static int zcache_init(void)
frontswap_tmem_exclusive_gets(true);
pr_info("%s: frontswap enabled using kernel transcendent "
"memory and compression buddies\n", namestr);
-#ifdef ZCACHE_DEBUG
+#ifdef CONFIG_ZCACHE_DEBUG
pr_info("%s: frontswap: excl gets = %d active only = %d\n",
namestr, frontswap_has_exclusive_gets,
!disable_frontswap_ignore_nonactive);
--
1.7.11.7
next prev parent reply other threads:[~2013-02-01 20:54 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-01 20:52 [RFC PATCH] Various fixes for zcache Konrad Rzeszutek Wilk
2013-02-01 20:52 ` [PATCH 01/16] zcache: s/int/bool/ on the various options Konrad Rzeszutek Wilk
2013-02-01 20:52 ` [PATCH 02/16] zcache: Provide accessory functions for counter increase Konrad Rzeszutek Wilk
2013-02-01 20:52 ` [PATCH 03/16] zcache: Provide accessory functions for counter decrease Konrad Rzeszutek Wilk
2013-02-01 20:52 ` [PATCH 04/16] zcache: The last of the atomic reads has now an accessory function Konrad Rzeszutek Wilk
2013-02-01 20:52 ` [PATCH 05/16] zcache: Fix compile warnings due to usage of debugfs_create_size_t Konrad Rzeszutek Wilk
2013-02-01 20:52 ` [PATCH 06/16] zcache: Make the debug code use pr_debug Konrad Rzeszutek Wilk
2013-02-01 20:52 ` [PATCH 07/16] zcache: Move debugfs code out of zcache-main.c file Konrad Rzeszutek Wilk
2013-02-01 20:52 ` [PATCH 08/16] zcache/debug: Use an array to initialize/use debugfs attributes Konrad Rzeszutek Wilk
2013-02-01 20:52 ` [PATCH 09/16] zcache: Move the last of the debugfs counters out Konrad Rzeszutek Wilk
2013-02-01 20:52 ` [PATCH 10/16] zcache: Module license is defined twice Konrad Rzeszutek Wilk
2013-02-01 20:52 ` Konrad Rzeszutek Wilk [this message]
2013-02-01 20:52 ` [PATCH 12/16] zcache/zbud: Fix compiler warnings Konrad Rzeszutek Wilk
2013-02-01 20:52 ` [PATCH 13/16] zcache/zbud: Add incremental accessory counters Konrad Rzeszutek Wilk
2013-02-01 20:52 ` [PATCH 14/16] zcache/zbud: Provide the accessory functions for counter decrease Konrad Rzeszutek Wilk
2013-02-01 20:52 ` [PATCH 15/16] ramster: Fix compile warnings due to usage of debugfs_create_size_t Konrad Rzeszutek Wilk
2013-02-01 20:52 ` [PATCH 16/16] zcache/zbud: Fix __init mismatch Konrad Rzeszutek Wilk
2013-02-14 3:04 [PATCH] Various cleanups/fixes to zcache (v3) Konrad Rzeszutek Wilk
2013-02-14 3:05 ` [PATCH 11/16] zcache/debug: Coalesce all debug under CONFIG_ZCACHE_DEBUG Konrad Rzeszutek Wilk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1359751939-23584-12-git-send-email-konrad.wilk@oracle.com \
--to=konrad@kernel.org \
--cc=dan.magenheimer@oracle.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rcj@linux.vnet.ibm.com \
--cc=sjenning@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®