[PATCH 06/16] zcache: Make the debug code use pr_debug
as if you are debugging this driver you would be using 'debug'
on the command line anyhow - and this would dump the debug
data on the proper loglevel.
While at it also remove the unconditional #define ZCACHE_DEBUG.
Signed-off-by: Konrad Rzeszutek Wilk
---
drivers/staging/zcache/zcache-main.c | 85 +---
1 file changed, 41 insertions(+), 44 deletions(-)
diff --git a/drivers/staging/zcache/zcache-main.c
b/drivers/staging/zcache/zcache-main.c
index 4bd4107..d4bf4a2 100644
--- a/drivers/staging/zcache/zcache-main.c
+++ b/drivers/staging/zcache/zcache-main.c
@@ -355,71 +355,68 @@ static int zcache_debugfs_init(void)
#undef zdfs64
#endif
-#define ZCACHE_DEBUG
-#ifdef ZCACHE_DEBUG
/* developers can call this in case of ooms, e.g. to find memory leaks */
void zcache_dump(void)
{
- pr_info("zcache: obj_count=%zd\n", zcache_obj_count);
- pr_info("zcache: obj_count_max=%zd\n", zcache_obj_count_max);
- pr_info("zcache: objnode_count=%zd\n", zcache_objnode_count);
- pr_info("zcache: objnode_count_max=%zd\n", zcache_objnode_count_max);
- pr_info("zcache: flush_total=%zd\n", zcache_flush_total);
- pr_info("zcache: flush_found=%zd\n", zcache_flush_found);
- pr_info("zcache: flobj_total=%zd\n", zcache_flobj_total);
- pr_info("zcache: flobj_found=%zd\n", zcache_flobj_found);
- pr_info("zcache: failed_eph_puts=%zd\n", zcache_failed_eph_puts);
- pr_info("zcache: failed_pers_puts=%zd\n", zcache_failed_pers_puts);
- pr_info("zcache: failed_get_free_pages=%zd\n",
+ pr_debug("zcache: obj_count=%zd\n", zcache_obj_count);
+ pr_debug("zcache: obj_count_max=%zd\n", zcache_obj_count_max);
+ pr_debug("zcache: objnode_count=%zd\n", zcache_objnode_count);
+ pr_debug("zcache: objnode_count_max=%zd\n", zcache_objnode_count_max);
+ pr_debug("zcache: flush_total=%zd\n", zcache_flush_total);
+ pr_debug("zcache: flush_found=%zd\n", zcache_flush_found);
+ pr_debug("zcache: flobj_total=%zd\n", zcache_flobj_total);
+ pr_debug("zcache: flobj_found=%zd\n", zcache_flobj_found);
+ pr_debug("zcache: failed_eph_puts=%zd\n", zcache_failed_eph_puts);
+ pr_debug("zcache: failed_pers_puts=%zd\n", zcache_failed_pers_puts);
+ pr_debug("zcache: failed_get_free_pages=%zd\n",
zcache_failed_getfreepages);
- pr_info("zcache: failed_alloc=%zd\n", zcache_failed_alloc);
- pr_info("zcache: put_to_flush=%zd\n", zcache_put_to_flush);
- pr_info("zcache: compress_poor=%zd\n", zcache_compress_poor);
- pr_info("zcache: mean_compress_poor=%zd\n",
+ pr_debug("zcache: failed_alloc=%zd\n", zcache_failed_alloc);
+ pr_debug("zcache: put_to_flush=%zd\n", zcache_put_to_flush);
+ pr_debug("zcache: compress_poor=%zd\n", zcache_compress_poor);
+ pr_debug("zcache: mean_compress_poor=%zd\n",
zcache_mean_compress_poor);
- pr_info("zcache: eph_ate_tail=%zd\n", zcache_eph_ate_tail);
- pr_info("zcache: eph_ate_tail_failed=%zd\n",
+ pr_debug("zcache: eph_ate_tail=%zd\n", zcache_eph_ate_tail);
+ pr_debug("zcache: eph_ate_tail_failed=%zd\n",
zcache_eph_ate_tail_failed);
- pr_info("zcache: pers_ate_eph=%zd\n", zcache_pers_ate_eph);
- pr_info("zcache: pers_ate_eph_failed=%zd\n",
+ pr_debug("zcache: pers_ate_eph=%zd\n", zcache_pers_ate_eph);
+ pr_debug("zcache: pers_ate_eph_failed=%zd\n",
zcache_pers_ate_eph_failed);
- pr_info("zcache: evicted_eph_zpages=%zd\n", zcache_evicted_eph_zpages);
- pr_info("zcache: evicted_eph_pageframes=%zd\n",
+ pr_debug("zcache: evicted_eph_zpages=%zd\n", zcache_evicted_eph_zpages);
+ pr_debug("zcache: evicted_eph_pageframes=%zd\n",
zcache_evicted_eph_pageframes);
- pr_info("zcache: eph_pageframes=%zd\n", zcache_eph_pageframes);
- pr_info("zcache: eph_pageframes_max=%zd\n", zcache_eph_pageframes_max);
- pr_info("zcache: pers_pageframes=%zd\n", zcache_pers_pageframes);
- pr_info("zcache: pers_pageframes_max=%zd\n",
+ pr_debug("zcache: eph_pageframes=%zd\n", zcache_eph_pageframes);
+ pr_debug("zcache: eph_pageframes_max=%zd\n", zcache_eph_pageframes_max);
+ pr_debug("zcache: pers_pageframes=%zd\n", zcache_pers_pageframes);
+ pr_debug("zcache: pers_pageframes_max=%zd\n",
zcache_pers_pageframes_max);
- pr_info("zcache: eph_zpages=%zd\n", zcache_eph_zpages);
- pr_info("zcache: eph_zpages_max=%zd\n", zcache_eph_zpages_max);
- pr_info("zcache: pers_zpages=%zd\n", zcache_pers_zpages);
- pr_info("zcache: pers_zpages_max=%zd\n", zcache_pers_zpages_max);
- pr_info("zcache: last_active_file_pageframes=%zd\n",
+ pr_debug("zcache: eph_zpages=%zd\n", zcache_eph_zpages);
+ pr_debug("zcache: eph_zpages_max=%zd\n",
[PATCH 06/16] zcache: Make the debug code use pr_debug
as if you are debugging this driver you would be using 'debug'
on the command line anyhow - and this would dump the debug
data on the proper loglevel.
While at it also remove the unconditional #define ZCACHE_DEBUG.
Signed-off-by: Konrad Rzeszutek Wilk konrad.w...@oracle.com
---
drivers/staging/zcache/zcache-main.c | 85 +---
1 file changed, 41 insertions(+), 44 deletions(-)
diff --git a/drivers/staging/zcache/zcache-main.c
b/drivers/staging/zcache/zcache-main.c
index 4bd4107..d4bf4a2 100644
--- a/drivers/staging/zcache/zcache-main.c
+++ b/drivers/staging/zcache/zcache-main.c
@@ -355,71 +355,68 @@ static int zcache_debugfs_init(void)
#undef zdfs64
#endif
-#define ZCACHE_DEBUG
-#ifdef ZCACHE_DEBUG
/* developers can call this in case of ooms, e.g. to find memory leaks */
void zcache_dump(void)
{
- pr_info(zcache: obj_count=%zd\n, zcache_obj_count);
- pr_info(zcache: obj_count_max=%zd\n, zcache_obj_count_max);
- pr_info(zcache: objnode_count=%zd\n, zcache_objnode_count);
- pr_info(zcache: objnode_count_max=%zd\n, zcache_objnode_count_max);
- pr_info(zcache: flush_total=%zd\n, zcache_flush_total);
- pr_info(zcache: flush_found=%zd\n, zcache_flush_found);
- pr_info(zcache: flobj_total=%zd\n, zcache_flobj_total);
- pr_info(zcache: flobj_found=%zd\n, zcache_flobj_found);
- pr_info(zcache: failed_eph_puts=%zd\n, zcache_failed_eph_puts);
- pr_info(zcache: failed_pers_puts=%zd\n, zcache_failed_pers_puts);
- pr_info(zcache: failed_get_free_pages=%zd\n,
+ pr_debug(zcache: obj_count=%zd\n, zcache_obj_count);
+ pr_debug(zcache: obj_count_max=%zd\n, zcache_obj_count_max);
+ pr_debug(zcache: objnode_count=%zd\n, zcache_objnode_count);
+ pr_debug(zcache: objnode_count_max=%zd\n, zcache_objnode_count_max);
+ pr_debug(zcache: flush_total=%zd\n, zcache_flush_total);
+ pr_debug(zcache: flush_found=%zd\n, zcache_flush_found);
+ pr_debug(zcache: flobj_total=%zd\n, zcache_flobj_total);
+ pr_debug(zcache: flobj_found=%zd\n, zcache_flobj_found);
+ pr_debug(zcache: failed_eph_puts=%zd\n, zcache_failed_eph_puts);
+ pr_debug(zcache: failed_pers_puts=%zd\n, zcache_failed_pers_puts);
+ pr_debug(zcache: failed_get_free_pages=%zd\n,
zcache_failed_getfreepages);
- pr_info(zcache: failed_alloc=%zd\n, zcache_failed_alloc);
- pr_info(zcache: put_to_flush=%zd\n, zcache_put_to_flush);
- pr_info(zcache: compress_poor=%zd\n, zcache_compress_poor);
- pr_info(zcache: mean_compress_poor=%zd\n,
+ pr_debug(zcache: failed_alloc=%zd\n, zcache_failed_alloc);
+ pr_debug(zcache: put_to_flush=%zd\n, zcache_put_to_flush);
+ pr_debug(zcache: compress_poor=%zd\n, zcache_compress_poor);
+ pr_debug(zcache: mean_compress_poor=%zd\n,
zcache_mean_compress_poor);
- pr_info(zcache: eph_ate_tail=%zd\n, zcache_eph_ate_tail);
- pr_info(zcache: eph_ate_tail_failed=%zd\n,
+ pr_debug(zcache: eph_ate_tail=%zd\n, zcache_eph_ate_tail);
+ pr_debug(zcache: eph_ate_tail_failed=%zd\n,
zcache_eph_ate_tail_failed);
- pr_info(zcache: pers_ate_eph=%zd\n, zcache_pers_ate_eph);
- pr_info(zcache: pers_ate_eph_failed=%zd\n,
+ pr_debug(zcache: pers_ate_eph=%zd\n, zcache_pers_ate_eph);
+ pr_debug(zcache: pers_ate_eph_failed=%zd\n,
zcache_pers_ate_eph_failed);
- pr_info(zcache: evicted_eph_zpages=%zd\n, zcache_evicted_eph_zpages);
- pr_info(zcache: evicted_eph_pageframes=%zd\n,
+ pr_debug(zcache: evicted_eph_zpages=%zd\n, zcache_evicted_eph_zpages);
+ pr_debug(zcache: evicted_eph_pageframes=%zd\n,
zcache_evicted_eph_pageframes);
- pr_info(zcache: eph_pageframes=%zd\n, zcache_eph_pageframes);
- pr_info(zcache: eph_pageframes_max=%zd\n, zcache_eph_pageframes_max);
- pr_info(zcache: pers_pageframes=%zd\n, zcache_pers_pageframes);
- pr_info(zcache: pers_pageframes_max=%zd\n,
+ pr_debug(zcache: eph_pageframes=%zd\n, zcache_eph_pageframes);
+ pr_debug(zcache: eph_pageframes_max=%zd\n, zcache_eph_pageframes_max);
+ pr_debug(zcache: pers_pageframes=%zd\n, zcache_pers_pageframes);
+ pr_debug(zcache: pers_pageframes_max=%zd\n,
zcache_pers_pageframes_max);
- pr_info(zcache: eph_zpages=%zd\n, zcache_eph_zpages);
- pr_info(zcache: eph_zpages_max=%zd\n, zcache_eph_zpages_max);
- pr_info(zcache: pers_zpages=%zd\n, zcache_pers_zpages);
- pr_info(zcache: pers_zpages_max=%zd\n, zcache_pers_zpages_max);
- pr_info(zcache: last_active_file_pageframes=%zd\n,
+ pr_debug(zcache: eph_zpages=%zd\n, zcache_eph_zpages);
+ pr_debug(zcache: eph_zpages_max=%zd\n, zcache_eph_zpages_max);
+ pr_debug(zcache: pers_zpages=%zd\n, zcache_pers_zpages);
+
[PATCH 06/16] zcache: Make the debug code use pr_debug
as if you are debugging this driver you would be using 'debug'
on the command line anyhow - and this would dump the debug
data on the proper loglevel.
While at it also remove the unconditional #define ZCACHE_DEBUG.
Signed-off-by: Konrad Rzeszutek Wilk
---
drivers/staging/zcache/zcache-main.c | 69 +---
1 file changed, 33 insertions(+), 36 deletions(-)
diff --git a/drivers/staging/zcache/zcache-main.c
b/drivers/staging/zcache/zcache-main.c
index bf59c4d..3fd1561 100644
--- a/drivers/staging/zcache/zcache-main.c
+++ b/drivers/staging/zcache/zcache-main.c
@@ -349,56 +349,53 @@ static int zcache_debugfs_init(void)
#undef zdfs64
#endif
-#define ZCACHE_DEBUG
-#ifdef ZCACHE_DEBUG
/* developers can call this in case of ooms, e.g. to find memory leaks */
void zcache_dump(void)
{
- pr_info("zcache: obj_count=%u\n", zcache_obj_count);
- pr_info("zcache: obj_count_max=%u\n", zcache_obj_count_max);
- pr_info("zcache: objnode_count=%u\n", zcache_objnode_count);
- pr_info("zcache: objnode_count_max=%u\n", zcache_objnode_count_max);
- pr_info("zcache: flush_total=%u\n", zcache_flush_total);
- pr_info("zcache: flush_found=%u\n", zcache_flush_found);
- pr_info("zcache: flobj_total=%u\n", zcache_flobj_total);
- pr_info("zcache: flobj_found=%u\n", zcache_flobj_found);
- pr_info("zcache: failed_eph_puts=%u\n", zcache_failed_eph_puts);
- pr_info("zcache: failed_pers_puts=%u\n", zcache_failed_pers_puts);
- pr_info("zcache: failed_get_free_pages=%u\n",
+ pr_debug("zcache: obj_count=%u\n", zcache_obj_count);
+ pr_debug("zcache: obj_count_max=%u\n", zcache_obj_count_max);
+ pr_debug("zcache: objnode_count=%u\n", zcache_objnode_count);
+ pr_debug("zcache: objnode_count_max=%u\n", zcache_objnode_count_max);
+ pr_debug("zcache: flush_total=%u\n", zcache_flush_total);
+ pr_debug("zcache: flush_found=%u\n", zcache_flush_found);
+ pr_debug("zcache: flobj_total=%u\n", zcache_flobj_total);
+ pr_debug("zcache: flobj_found=%u\n", zcache_flobj_found);
+ pr_debug("zcache: failed_eph_puts=%u\n", zcache_failed_eph_puts);
+ pr_debug("zcache: failed_pers_puts=%u\n", zcache_failed_pers_puts);
+ pr_debug("zcache: failed_get_free_pages=%u\n",
zcache_failed_getfreepages);
- pr_info("zcache: failed_alloc=%u\n", zcache_failed_alloc);
- pr_info("zcache: put_to_flush=%u\n", zcache_put_to_flush);
- pr_info("zcache: compress_poor=%u\n", zcache_compress_poor);
- pr_info("zcache: mean_compress_poor=%u\n",
+ pr_debug("zcache: failed_alloc=%u\n", zcache_failed_alloc);
+ pr_debug("zcache: put_to_flush=%u\n", zcache_put_to_flush);
+ pr_debug("zcache: compress_poor=%u\n", zcache_compress_poor);
+ pr_debug("zcache: mean_compress_poor=%u\n",
zcache_mean_compress_poor);
- pr_info("zcache: eph_ate_tail=%u\n", zcache_eph_ate_tail);
- pr_info("zcache: eph_ate_tail_failed=%u\n",
+ pr_debug("zcache: eph_ate_tail=%u\n", zcache_eph_ate_tail);
+ pr_debug("zcache: eph_ate_tail_failed=%u\n",
zcache_eph_ate_tail_failed);
- pr_info("zcache: pers_ate_eph=%u\n", zcache_pers_ate_eph);
- pr_info("zcache: pers_ate_eph_failed=%u\n",
+ pr_debug("zcache: pers_ate_eph=%u\n", zcache_pers_ate_eph);
+ pr_debug("zcache: pers_ate_eph_failed=%u\n",
zcache_pers_ate_eph_failed);
- pr_info("zcache: evicted_eph_zpages=%u\n", zcache_evicted_eph_zpages);
- pr_info("zcache: evicted_eph_pageframes=%u\n",
+ pr_debug("zcache: evicted_eph_zpages=%u\n", zcache_evicted_eph_zpages);
+ pr_debug("zcache: evicted_eph_pageframes=%u\n",
zcache_evicted_eph_pageframes);
- pr_info("zcache: eph_pageframes=%u\n", zcache_eph_pageframes);
- pr_info("zcache: eph_pageframes_max=%u\n", zcache_eph_pageframes_max);
- pr_info("zcache: pers_pageframes=%u\n", zcache_pers_pageframes);
- pr_info("zcache: pers_pageframes_max=%u\n",
+ pr_debug("zcache: eph_pageframes=%u\n", zcache_eph_pageframes);
+ pr_debug("zcache: eph_pageframes_max=%u\n", zcache_eph_pageframes_max);
+ pr_debug("zcache: pers_pageframes=%u\n", zcache_pers_pageframes);
+ pr_debug("zcache: pers_pageframes_max=%u\n",
zcache_pers_pageframes_max);
- pr_info("zcache: eph_zpages=%u\n", zcache_eph_zpages);
- pr_info("zcache: eph_zpages_max=%u\n", zcache_eph_zpages_max);
- pr_info("zcache: pers_zpages=%u\n", zcache_pers_zpages);
- pr_info("zcache: pers_zpages_max=%u\n", zcache_pers_zpages_max);
- pr_info("zcache: eph_zbytes=%llu\n",
+ pr_debug("zcache: eph_zpages=%u\n", zcache_eph_zpages);
+ pr_debug("zcache: eph_zpages_max=%u\n", zcache_eph_zpages_max);
+ pr_debug("zcache: pers_zpages=%u\n",
[PATCH 06/16] zcache: Make the debug code use pr_debug
as if you are debugging this driver you would be using 'debug'
on the command line anyhow - and this would dump the debug
data on the proper loglevel.
While at it also remove the unconditional #define ZCACHE_DEBUG.
Signed-off-by: Konrad Rzeszutek Wilk konrad.w...@oracle.com
---
drivers/staging/zcache/zcache-main.c | 69 +---
1 file changed, 33 insertions(+), 36 deletions(-)
diff --git a/drivers/staging/zcache/zcache-main.c
b/drivers/staging/zcache/zcache-main.c
index bf59c4d..3fd1561 100644
--- a/drivers/staging/zcache/zcache-main.c
+++ b/drivers/staging/zcache/zcache-main.c
@@ -349,56 +349,53 @@ static int zcache_debugfs_init(void)
#undef zdfs64
#endif
-#define ZCACHE_DEBUG
-#ifdef ZCACHE_DEBUG
/* developers can call this in case of ooms, e.g. to find memory leaks */
void zcache_dump(void)
{
- pr_info(zcache: obj_count=%u\n, zcache_obj_count);
- pr_info(zcache: obj_count_max=%u\n, zcache_obj_count_max);
- pr_info(zcache: objnode_count=%u\n, zcache_objnode_count);
- pr_info(zcache: objnode_count_max=%u\n, zcache_objnode_count_max);
- pr_info(zcache: flush_total=%u\n, zcache_flush_total);
- pr_info(zcache: flush_found=%u\n, zcache_flush_found);
- pr_info(zcache: flobj_total=%u\n, zcache_flobj_total);
- pr_info(zcache: flobj_found=%u\n, zcache_flobj_found);
- pr_info(zcache: failed_eph_puts=%u\n, zcache_failed_eph_puts);
- pr_info(zcache: failed_pers_puts=%u\n, zcache_failed_pers_puts);
- pr_info(zcache: failed_get_free_pages=%u\n,
+ pr_debug(zcache: obj_count=%u\n, zcache_obj_count);
+ pr_debug(zcache: obj_count_max=%u\n, zcache_obj_count_max);
+ pr_debug(zcache: objnode_count=%u\n, zcache_objnode_count);
+ pr_debug(zcache: objnode_count_max=%u\n, zcache_objnode_count_max);
+ pr_debug(zcache: flush_total=%u\n, zcache_flush_total);
+ pr_debug(zcache: flush_found=%u\n, zcache_flush_found);
+ pr_debug(zcache: flobj_total=%u\n, zcache_flobj_total);
+ pr_debug(zcache: flobj_found=%u\n, zcache_flobj_found);
+ pr_debug(zcache: failed_eph_puts=%u\n, zcache_failed_eph_puts);
+ pr_debug(zcache: failed_pers_puts=%u\n, zcache_failed_pers_puts);
+ pr_debug(zcache: failed_get_free_pages=%u\n,
zcache_failed_getfreepages);
- pr_info(zcache: failed_alloc=%u\n, zcache_failed_alloc);
- pr_info(zcache: put_to_flush=%u\n, zcache_put_to_flush);
- pr_info(zcache: compress_poor=%u\n, zcache_compress_poor);
- pr_info(zcache: mean_compress_poor=%u\n,
+ pr_debug(zcache: failed_alloc=%u\n, zcache_failed_alloc);
+ pr_debug(zcache: put_to_flush=%u\n, zcache_put_to_flush);
+ pr_debug(zcache: compress_poor=%u\n, zcache_compress_poor);
+ pr_debug(zcache: mean_compress_poor=%u\n,
zcache_mean_compress_poor);
- pr_info(zcache: eph_ate_tail=%u\n, zcache_eph_ate_tail);
- pr_info(zcache: eph_ate_tail_failed=%u\n,
+ pr_debug(zcache: eph_ate_tail=%u\n, zcache_eph_ate_tail);
+ pr_debug(zcache: eph_ate_tail_failed=%u\n,
zcache_eph_ate_tail_failed);
- pr_info(zcache: pers_ate_eph=%u\n, zcache_pers_ate_eph);
- pr_info(zcache: pers_ate_eph_failed=%u\n,
+ pr_debug(zcache: pers_ate_eph=%u\n, zcache_pers_ate_eph);
+ pr_debug(zcache: pers_ate_eph_failed=%u\n,
zcache_pers_ate_eph_failed);
- pr_info(zcache: evicted_eph_zpages=%u\n, zcache_evicted_eph_zpages);
- pr_info(zcache: evicted_eph_pageframes=%u\n,
+ pr_debug(zcache: evicted_eph_zpages=%u\n, zcache_evicted_eph_zpages);
+ pr_debug(zcache: evicted_eph_pageframes=%u\n,
zcache_evicted_eph_pageframes);
- pr_info(zcache: eph_pageframes=%u\n, zcache_eph_pageframes);
- pr_info(zcache: eph_pageframes_max=%u\n, zcache_eph_pageframes_max);
- pr_info(zcache: pers_pageframes=%u\n, zcache_pers_pageframes);
- pr_info(zcache: pers_pageframes_max=%u\n,
+ pr_debug(zcache: eph_pageframes=%u\n, zcache_eph_pageframes);
+ pr_debug(zcache: eph_pageframes_max=%u\n, zcache_eph_pageframes_max);
+ pr_debug(zcache: pers_pageframes=%u\n, zcache_pers_pageframes);
+ pr_debug(zcache: pers_pageframes_max=%u\n,
zcache_pers_pageframes_max);
- pr_info(zcache: eph_zpages=%u\n, zcache_eph_zpages);
- pr_info(zcache: eph_zpages_max=%u\n, zcache_eph_zpages_max);
- pr_info(zcache: pers_zpages=%u\n, zcache_pers_zpages);
- pr_info(zcache: pers_zpages_max=%u\n, zcache_pers_zpages_max);
- pr_info(zcache: eph_zbytes=%llu\n,
+ pr_debug(zcache: eph_zpages=%u\n, zcache_eph_zpages);
+ pr_debug(zcache: eph_zpages_max=%u\n, zcache_eph_zpages_max);
+ pr_debug(zcache: pers_zpages=%u\n, zcache_pers_zpages);
+ pr_debug(zcache: pers_zpages_max=%u\n, zcache_pers_zpages_max);
+
