diff options
| author | Minchan Kim <minchan@kernel.org> | 2014-01-30 15:46:01 -0800 |
|---|---|---|
| committer | Simon Shields <keepcalm444@gmail.com> | 2016-06-12 21:19:54 +1000 |
| commit | c8f984bff7c876be85c8b4170ca13fa2dc99b516 (patch) | |
| tree | 575c6ae54c274d02519646b624c64e44c960f08b /drivers/block | |
| parent | 95fbfb88ab45d57f6b9e48f92457ddd661787f30 (diff) | |
| download | kernel_samsung_smdk4412-c8f984bff7c876be85c8b4170ca13fa2dc99b516.zip kernel_samsung_smdk4412-c8f984bff7c876be85c8b4170ca13fa2dc99b516.tar.gz kernel_samsung_smdk4412-c8f984bff7c876be85c8b4170ca13fa2dc99b516.tar.bz2 | |
zram: remove unnecessary free
Commit a0c516cbfc74 ("zram: don't grab mutex in zram_slot_free_noity")
introduced pending zram slot free in zram's write path in case of
missing slot free by memory allocation failure in zram_slot_free_notify
but it is not necessary because we have already freed the slot right
before overwriting.
Signed-off-by: Minchan Kim <minchan@kernel.org>
Cc: Nitin Gupta <ngupta@vflare.org>
Cc: Jerome Marchand <jmarchan@redhat.com>
Tested-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/zram/zram_drv.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 87fc7f3..f39c2f9 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -450,14 +450,6 @@ static int zram_bvec_write(struct zram *zram, struct bio_vec *bvec, u32 index, goto out; } - /* - * zram_slot_free_notify could miss free so that let's - * double check. - */ - if (unlikely(meta->table[index].handle || - zram_test_flag(meta, index, ZRAM_ZERO))) - zram_free_page(zram, index); - ret = lzo1x_1_compress(uncmem, PAGE_SIZE, src, &clen, meta->compress_workmem); |