Subject: [folded-merged] zbud-add-to-mm-init-under_reclaim.patch removed from -mm tree To: sjenning@xxxxxxxxxxxxxxxxxx,bob.liu@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Wed, 10 Jul 2013 16:02:28 -0700 The patch titled Subject: zswap: init under_reclaim has been removed from the -mm tree. Its filename was zbud-add-to-mm-init-under_reclaim.patch This patch was dropped because it was folded into zbud-add-to-mm.patch ------------------------------------------------------ From: Seth Jennings <sjenning@xxxxxxxxxxxxxxxxxx> Subject: zswap: init under_reclaim Bob Liu reported a memory leak in zswap. This was due to the under_reclaim field in the zbud header not being initialized to 0, which resulted in zbud_free() not freeing the page under the false assumption that the page was undergoing zbud reclaim. This patch properly initializes the under_reclaim field. Signed-off-by: Seth Jennings <sjenning@xxxxxxxxxxxxxxxxxx> Reported-by: Bob Liu <bob.liu@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/zbud.c | 1 + 1 file changed, 1 insertion(+) diff -puN mm/zbud.c~zbud-add-to-mm-init-under_reclaim mm/zbud.c --- a/mm/zbud.c~zbud-add-to-mm-init-under_reclaim +++ a/mm/zbud.c @@ -138,6 +138,7 @@ static struct zbud_header *init_zbud_pag zhdr->last_chunks = 0; INIT_LIST_HEAD(&zhdr->buddy); INIT_LIST_HEAD(&zhdr->lru); + zhdr->under_reclaim = 0; return zhdr; } _ Patches currently in -mm which might be from sjenning@xxxxxxxxxxxxxxxxxx are origin.patch zbud-add-to-mm.patch zswap-add-to-mm.patch zswap-add-to-mm-fix-kconfig-to-depend-on-crypto=y.patch zswap-add-documentation.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