From fb5d0a51e23a45226a9a42b80e262861ed3e0e5a Mon Sep 17 00:00:00 2001 From: Minchan Kim Date: Fri, 8 Jun 2012 15:39:26 +0900 Subject: [PATCH] --- yaml --- r: 317247 b: refs/heads/master c: 374a69191d12a0525b7ffe1197abc30c4795a230 h: refs/heads/master i: 317245: 209ff322ab3cbf275eee6bbe211c6f9f781abc2f 317243: 601fe7f7c4dfb2901a2a30d9edef6b3cb5ad029a 317239: 9cfb2091f90749c50d704e27fa8a060e95443fdc 317231: 80342cb0d8355801e2d490f7fda42de752704f1b 317215: a6104840cf25ffe0dcdc283914d6bf9a753f43c9 317183: 4374de88e8e9ed0c0a788299710a2b6214caebad v: v3 --- [refs] | 2 +- trunk/drivers/staging/zram/zram_drv.c | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 531f8c8f7460..2bf3ba2a9d05 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c234434835b1f4bad9bdbae6710044cba387c9e5 +refs/heads/master: 374a69191d12a0525b7ffe1197abc30c4795a230 diff --git a/trunk/drivers/staging/zram/zram_drv.c b/trunk/drivers/staging/zram/zram_drv.c index abd69d13d0a1..0cdc303ad565 100644 --- a/trunk/drivers/staging/zram/zram_drv.c +++ b/trunk/drivers/staging/zram/zram_drv.c @@ -280,26 +280,27 @@ static int zram_read_before_write(struct zram *zram, char *mem, u32 index) size_t clen = PAGE_SIZE; struct zobj_header *zheader; unsigned char *cmem; + unsigned long handle = zram->table[index].handle; - if (zram_test_flag(zram, index, ZRAM_ZERO) || - !zram->table[index].handle) { + if (zram_test_flag(zram, index, ZRAM_ZERO) || !handle) { memset(mem, 0, PAGE_SIZE); return 0; } - cmem = zs_map_object(zram->mem_pool, zram->table[index].handle); - /* Page is stored uncompressed since it's incompressible */ if (unlikely(zram_test_flag(zram, index, ZRAM_UNCOMPRESSED))) { - memcpy(mem, cmem, PAGE_SIZE); - kunmap_atomic(cmem); + char *src = kmap_atomic((struct page *)handle); + memcpy(mem, src, PAGE_SIZE); + kunmap_atomic(src); return 0; } + cmem = zs_map_object(zram->mem_pool, handle); + ret = lzo1x_decompress_safe(cmem + sizeof(*zheader), zram->table[index].size, mem, &clen); - zs_unmap_object(zram->mem_pool, zram->table[index].handle); + zs_unmap_object(zram->mem_pool, handle); /* Should NEVER happen. Return bio error if it does. */ if (unlikely(ret != LZO_E_OK)) {