Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b0cba96 authored by Minchan Kim's avatar Minchan Kim Committed by Michael Benedict
Browse files

UPSTREAM: zram: use zram_free_page instead of open-coded 

The zram_free_page already handles NULL handle case and same page so use
it to reduce error probability.  (Acutaully, I made a mistake when I
handled same page feature)

Link: http://lkml.kernel.org/r/1492052365-16169-7-git-send-email-minchan@kernel.org


Signed-off-by: default avatarMinchan Kim <minchan@kernel.org>
Cc: Hannes Reinecke <hare@suse.com>
Cc: Johannes Thumshirn <jthumshirn@suse.de>
Cc: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>

(cherry picked from commit 302128dce142d780417aa548bfd7ef4dfb89fa80)
Signed-off-by: default avatarPeter Kalauskas <peskal@google.com>
Bug: 112488418
Change-Id: Ie38c52dfb1959377936b7cd9158ad1b5a02219bd
parent 4c7fbe87

drivers/block/zram/zram_drv.c

+3 −14
Original line number Diff line number Diff line
@@ -479,17 +479,8 @@ static void zram_meta_free(struct zram *zram, u64 disksize) 
	size_t index;



	/* Free all pages that are still in this zram device */

	for (index = 0; index < num_pages; index++) {

		unsigned long handle = zram_get_handle(zram, index);

		/*

		 * No memory is allocated for same element filled pages.

		 * Simply clear same page flag.

		 */

		if (!handle || zram_test_flag(zram, index, ZRAM_SAME))

			continue;



		zs_free(zram->mem_pool, handle);

	}

	for (index = 0; index < num_pages; index++)

		zram_free_page(zram, index);



	zs_destroy_pool(zram->mem_pool);

	vfree(zram->table);
@@ -972,9 +963,6 @@ static void zram_reset_device(struct zram *zram) 


	comp = zram->comp;

	disksize = zram->disksize;



	/* Reset stats */

	memset(&zram->stats, 0, sizeof(zram->stats));

	zram->disksize = 0;



	set_capacity(zram->disk, 0);
@@ -983,6 +971,7 @@ static void zram_reset_device(struct zram *zram) 
	up_write(&zram->init_lock);

	/* I/O operation under all of CPU are done so let's free */

	zram_meta_free(zram, disksize);

	memset(&zram->stats, 0, sizeof(zram->stats));

	zcomp_destroy(comp);

}