Subject: [merged] zram-remove-unnecessary-free.patch removed from -mm tree
To: minchan@xxxxxxxxxx,jmarchan@xxxxxxxxxx,ngupta@xxxxxxxxxx,sergey.senozhatsky@xxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Fri, 31 Jan 2014 11:16:25 -0800
The patch titled
Subject: zram: remove unnecessary free
has been removed from the -mm tree. Its filename was
zram-remove-unnecessary-free.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Minchan Kim <minchan@xxxxxxxxxx>
Subject: zram: remove unnecessary free
a0c516cbfc ("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@xxxxxxxxxx>
Cc: Nitin Gupta <ngupta@xxxxxxxxxx>
Cc: Jerome Marchand <jmarchan@xxxxxxxxxx>
Tested-by: Sergey Senozhatsky <sergey.senozhatsky@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/block/zram/zram_drv.c | 8 --------
1 file changed, 8 deletions(-)
diff -puN drivers/block/zram/zram_drv.c~zram-remove-unnecessary-free drivers/block/zram/zram_drv.c
--- a/drivers/block/zram/zram_drv.c~zram-remove-unnecessary-free
+++ a/drivers/block/zram/zram_drv.c
@@ -441,14 +441,6 @@ static int zram_bvec_write(struct zram *
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);
_
Patches currently in -mm which might be from minchan@xxxxxxxxxx are
origin.patch
mm-remove-bug_on-from-mlock_vma_page.patch
swap-add-a-simple-detector-for-inappropriate-swapin-readahead.patch
debugging-keep-track-of-page-owners.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
