Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 363558
b: refs/heads/master
c: 25eeb66
h: refs/heads/master
v: v3
  • Loading branch information
Wanpeng Li authored and Greg Kroah-Hartman committed Mar 19, 2013
1 parent 1582938 commit 39ce622
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: dcb4e2d9bb4e3b6ad05bc513a237a87e46952341
refs/heads/master: 25eeb667599b192ea850a062d69383ee864c06ab
5 changes: 1 addition & 4 deletions trunk/drivers/staging/zram/zram_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 39ce622

Please sign in to comment.