[PATCH -next 1/2] zram: fix compr_data_size stat

[PATCH -next 1/2] zram: fix compr_data_size stat

[Yisheng Xie]

The compr_data_size is a stat for compressed size of pages stored, which
should be updated when we compresse a page.

Meanwhile fix a typo in comment:
* read_from_bdev_async() return 1 to avoid call page_endio() in zram_rw_page()

Signed-off-by: Yisheng Xie <xieyisheng1@huawei.com>
---
Hi Minchan,
It this ok for you to fold it?

Thanks
Yisheng Xie

 drivers/block/zram/zram_drv.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index e27daca..d18b4ce 100644
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -455,7 +455,7 @@ void zram_page_end_io(struct bio *bio)
 }
 
 /*
- * Returns 0 if the submission is successful.
+ * Returns 1 if the submission is successful.
  */
 static int read_from_bdev_async(struct zram *zram, struct bio_vec *bvec,
 			unsigned long entry, struct bio *parent)
@@ -1059,6 +1059,7 @@ static int __zram_bvec_write(struct zram *zram, struct bio_vec *bvec,
 
 	zcomp_stream_put(zram->comp);
 	zs_unmap_object(zram->mem_pool, handle);
+	atomic64_add(comp_len, &zram->stats.compr_data_size);
 out:
 	/*
 	 * Free memory associated with this sector
-- 
1.8.3.1

[PATCH -next 2/2] zram: fix typo in comment

[Yisheng Xie]

ZRAM_SAME means page consists the same element not the entirely zero page.

Signed-off-by: Yisheng Xie <xieyisheng1@huawei.com>
---
 drivers/block/zram/zram_drv.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/block/zram/zram_drv.h b/drivers/block/zram/zram_drv.h
index 5573dc2..31762db 100644
--- a/drivers/block/zram/zram_drv.h
+++ b/drivers/block/zram/zram_drv.h
@@ -60,7 +60,7 @@
 
 /* Flags for zram pages (table[page_no].value) */
 enum zram_pageflags {
-	/* Page consists entirely of zeros */
+	/* Page consists the same element */
 	ZRAM_SAME = ZRAM_FLAG_SHIFT,
 	ZRAM_ACCESS,	/* page is now accessed */
 	ZRAM_WB,	/* page is stored on backing_device */
-- 
1.8.3.1

Re: [PATCH -next 1/2] zram: fix compr_data_size stat

[Minchan Kim]

On Mon, Aug 14, 2017 at 06:44:06PM +0800, Yisheng Xie wrote:
> The compr_data_size is a stat for compressed size of pages stored, which
> should be updated when we compresse a page.
> 
> Meanwhile fix a typo in comment:
> * read_from_bdev_async() return 1 to avoid call page_endio() in zram_rw_page()
> 
> Signed-off-by: Yisheng Xie <xieyisheng1@huawei.com>
Acked-by: Minchan Kim <minchan@kernel.org>

> ---
> Hi Minchan,
> It this ok for you to fold it?

When I read title of your patch into mmotm, I guess Andrew will fold it
but I'm okay if he might miss it so that it becomes stand-alone patch.

Thanks Yisheng!

Re: [PATCH -next 2/2] zram: fix typo in comment

[Minchan Kim]

On Mon, Aug 14, 2017 at 06:44:07PM +0800, Yisheng Xie wrote:
> ZRAM_SAME means page consists the same element not the entirely zero page.
> 
> Signed-off-by: Yisheng Xie <xieyisheng1@huawei.com>
Acked-by: Minchan Kim <minchan@kernel.org>
 
Thanks!