From cea228dc89023776a5e272e168fa207b0b628cb6 Mon Sep 17 00:00:00 2001 From: Wanpeng Li Date: Sat, 13 Apr 2013 21:01:30 +0800 Subject: [PATCH] --- yaml --- r: 364139 b: refs/heads/master c: 2a6aba8585c0f56d24daf53bfff29c91bcf0db8a h: refs/heads/master i: 364137: 761326d930127c135d8ac001c928f8d669b2c35b 364135: 803bd7beec5ef94aaeef4fc42c6031991fae4763 v: v3 --- [refs] | 2 +- trunk/drivers/staging/zcache/Kconfig | 8 ++++++++ trunk/drivers/staging/zcache/Makefile | 2 +- trunk/drivers/staging/zcache/ramster/debug.h | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ee4f160d84a2..d1f3644c5b52 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f7d751ff1d866faf723c5ed4d9a7815c37bc07cd +refs/heads/master: 2a6aba8585c0f56d24daf53bfff29c91bcf0db8a diff --git a/trunk/drivers/staging/zcache/Kconfig b/trunk/drivers/staging/zcache/Kconfig index c3b8a10e170f..05e87a1e5d93 100644 --- a/trunk/drivers/staging/zcache/Kconfig +++ b/trunk/drivers/staging/zcache/Kconfig @@ -33,6 +33,14 @@ config RAMSTER zcache2, compresses swap pages into local RAM, but then remotifies the compressed pages to another node in the RAMster cluster. +config RAMSTER_DEBUG + bool "Enable ramster debug statistics" + depends on DEBUG_FS && RAMSTER + default n + help + This is used to provide an debugfs directory with counters of + how ramster is doing. You probably want to set this to 'N'. + # Depends on not-yet-upstreamed mm patches to export end_swap_bio_write and # __add_to_swap_cache, and implement __swap_writepage (which is swap_writepage # without the frontswap call. When these are in-tree, the dependency on diff --git a/trunk/drivers/staging/zcache/Makefile b/trunk/drivers/staging/zcache/Makefile index 4956fa025a01..845a5c2721b5 100644 --- a/trunk/drivers/staging/zcache/Makefile +++ b/trunk/drivers/staging/zcache/Makefile @@ -1,6 +1,6 @@ zcache-y := zcache-main.o tmem.o zbud.o zcache-$(CONFIG_ZCACHE_DEBUG) += debug.o -zcache-$(CONFIG_RAMSTER) += ramster/debug.o +zcache-$(CONFIG_RAMSTER_DEBUG) += ramster/debug.o 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 diff --git a/trunk/drivers/staging/zcache/ramster/debug.h b/trunk/drivers/staging/zcache/ramster/debug.h index 4428c79e67f3..5ffab50807d8 100644 --- a/trunk/drivers/staging/zcache/ramster/debug.h +++ b/trunk/drivers/staging/zcache/ramster/debug.h @@ -1,6 +1,6 @@ #include -#ifdef CONFIG_RAMSTER +#ifdef CONFIG_RAMSTER_DEBUG extern long ramster_flnodes; static atomic_t ramster_flnodes_atomic = ATOMIC_INIT(0);