summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWanpeng Li <liwanp@linux.vnet.ibm.com>2013-03-13 15:06:16 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-18 17:42:34 -0700
commit25eeb667599b192ea850a062d69383ee864c06ab (patch)
treef2b1f8b4a46ec9d741bbc7bb591ab7807279c83b
parentdcb4e2d9bb4e3b6ad05bc513a237a87e46952341 (diff)
downloadblackbird-op-linux-25eeb667599b192ea850a062d69383ee864c06ab.tar.gz
blackbird-op-linux-25eeb667599b192ea850a062d69383ee864c06ab.zip
zram: fix zram_bvec_read duplicate dump failure message and stat accumulation
When zram decompress fails, the code unnecessarily dumps failure messages and does stat accumulation in function zram_decompress_page(), this work is already done in function zram_decompress_page, the patch skips the redundant work. Signed-off-by: Wanpeng Li <liwanp@linux.vnet.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/zram/zram_drv.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/staging/zram/zram_drv.c b/drivers/staging/zram/zram_drv.c
index 5918fd7d7e36..e34e3fe0ae2e 100644
--- a/drivers/staging/zram/zram_drv.c
+++ b/drivers/staging/zram/zram_drv.c
@@ -207,11 +207,8 @@ static int zram_bvec_read(struct zram *zram, struct bio_vec *bvec,
ret = zram_decompress_page(zram, uncmem, index);
/* Should NEVER happen. Return bio error if it does. */
- if (unlikely(ret != LZO_E_OK)) {
- pr_err("Decompression failed! err=%d, page=%u\n", ret, index);
- zram_stat64_inc(zram, &zram->stats.failed_reads);
+ if (unlikely(ret != LZO_E_OK))
goto out_cleanup;
- }
if (is_partial_io(bvec))
memcpy(user_mem + bvec->bv_offset, uncmem + offset,
OpenPOWER on IntegriCloud