Commit f0231305 authored by Miaohe Lin's avatar Miaohe Lin Committed by Linus Torvalds

mm/zsmalloc.c: convert to use kmem_cache_zalloc in cache_alloc_zspage()

We always memset the zspage allocated via cache_alloc_zspage.  So it's
more convenient to use kmem_cache_zalloc in cache_alloc_zspage than caller
do it manually.

Link: https://lkml.kernel.org/r/20210114120032.25885-1-linmiaohe@huawei.comSigned-off-by: default avatarMiaohe Lin <linmiaohe@huawei.com>
Reviewed-by: default avatarSergey Senozhatsky <sergey.senozhatsky@gmail.com>
Cc: Minchan Kim <minchan@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e818e820
...@@ -357,7 +357,7 @@ static void cache_free_handle(struct zs_pool *pool, unsigned long handle) ...@@ -357,7 +357,7 @@ static void cache_free_handle(struct zs_pool *pool, unsigned long handle)
static struct zspage *cache_alloc_zspage(struct zs_pool *pool, gfp_t flags) static struct zspage *cache_alloc_zspage(struct zs_pool *pool, gfp_t flags)
{ {
return kmem_cache_alloc(pool->zspage_cachep, return kmem_cache_zalloc(pool->zspage_cachep,
flags & ~(__GFP_HIGHMEM|__GFP_MOVABLE)); flags & ~(__GFP_HIGHMEM|__GFP_MOVABLE));
} }
...@@ -1064,7 +1064,6 @@ static struct zspage *alloc_zspage(struct zs_pool *pool, ...@@ -1064,7 +1064,6 @@ static struct zspage *alloc_zspage(struct zs_pool *pool,
if (!zspage) if (!zspage)
return NULL; return NULL;
memset(zspage, 0, sizeof(struct zspage));
zspage->magic = ZSPAGE_MAGIC; zspage->magic = ZSPAGE_MAGIC;
migrate_lock_init(zspage); migrate_lock_init(zspage);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment