The patch titled
Subject: Re: zram: introduce per-device debug_stat sysfs node
has been removed from the -mm tree. Its filename was
zram-introduce-per-device-debug_stat-sysfs-node-minchan.patch
This patch was dropped because it was folded into zram-introduce-per-device-debug_stat-sysfs-node.patch
------------------------------------------------------
From: Minchan Kim <minchan@xxxxxxxxxx>
Subject: Re: zram: introduce per-device debug_stat sysfs node
Fortunately, Andrew isn't pick up this patch yet so I want to replace
it to below suggested by Sergey which is better.
Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@xxxxxxxxx>
Signed-off-by: Minchan Kim <minchan@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/block/zram/zram_drv.c | 8 ++++----
drivers/block/zram/zram_drv.h | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff -puN drivers/block/zram/zram_drv.c~zram-introduce-per-device-debug_stat-sysfs-node-minchan drivers/block/zram/zram_drv.c
--- a/drivers/block/zram/zram_drv.c~zram-introduce-per-device-debug_stat-sysfs-node-minchan
+++ a/drivers/block/zram/zram_drv.c
@@ -446,7 +446,7 @@ static ssize_t debug_stat_show(struct de
ret = scnprintf(buf, PAGE_SIZE,
"version: %d\n%8llu\n",
version,
- (u64)atomic64_read(&zram->stats.num_recompress));
+ (u64)atomic64_read(&zram->stats.writestall));
up_read(&zram->init_lock);
return ret;
@@ -737,12 +737,12 @@ compress_again:
zcomp_strm_release(zram->comp, zstrm);
zstrm = NULL;
+ atomic64_inc(&zram->stats.writestall);
+
handle = zs_malloc(meta->mem_pool, clen,
GFP_NOIO | __GFP_HIGHMEM);
- if (handle) {
- atomic64_inc(&zram->stats.num_recompress);
+ if (handle)
goto compress_again;
- }
pr_err("Error allocating memory for compressed page: %u, size=%zu\n",
index, clen);
diff -puN drivers/block/zram/zram_drv.h~zram-introduce-per-device-debug_stat-sysfs-node-minchan drivers/block/zram/zram_drv.h
--- a/drivers/block/zram/zram_drv.h~zram-introduce-per-device-debug_stat-sysfs-node-minchan
+++ a/drivers/block/zram/zram_drv.h
@@ -85,7 +85,7 @@ struct zram_stats {
atomic64_t zero_pages; /* no. of zero filled pages */
atomic64_t pages_stored; /* no. of pages currently stored */
atomic_long_t max_used_pages; /* no. of maximum pages stored */
- atomic64_t num_recompress; /* no. of compression slow paths */
+ atomic64_t writestall; /* no. of write slow paths */
};
struct zram_meta {
_
Patches currently in -mm which might be from minchan@xxxxxxxxxx are
mm-disable-fault-around-on-emulated-access-bit-architecture.patch
zsmalloc-use-first_page-rather-than-page.patch
zsmalloc-clean-up-many-bug_on.patch
zsmalloc-reordering-function-parameter.patch
zsmalloc-remove-unused-pool-param-in-obj_free.patch
zram-introduce-per-device-debug_stat-sysfs-node.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
