From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752967AbaEGVwq (ORCPT ); Wed, 7 May 2014 17:52:46 -0400 Received: from mail-yk0-f169.google.com ([209.85.160.169]:41030 "EHLO mail-yk0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752940AbaEGVwk (ORCPT ); Wed, 7 May 2014 17:52:40 -0400 From: Dan Streetman To: Seth Jennings , Minchan Kim , Weijie Yang , Nitin Gupta Cc: Dan Streetman , Andrew Morton , Bob Liu , Hugh Dickins , Mel Gorman , Rik van Riel , Johannes Weiner , Sergey Senozhatsky , Linux-MM , linux-kernel Subject: [PATCH 2/4] mm/zbud: change zbud_alloc size type to size_t Date: Wed, 7 May 2014 17:51:34 -0400 Message-Id: <1399499496-3216-3-git-send-email-ddstreet@ieee.org> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1399499496-3216-1-git-send-email-ddstreet@ieee.org> References: <1397922764-1512-1-git-send-email-ddstreet@ieee.org> <1399499496-3216-1-git-send-email-ddstreet@ieee.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Change the type of the zbud_alloc() size param from unsigned int to size_t. Technically, this should not make any difference, as the zbud implementation already restricts the size to well within either type's limits; but as zsmalloc (and kmalloc) use size_t, and zpool will use size_t, this brings the size parameter type in line with zsmalloc/zpool. Signed-off-by: Dan Streetman Cc: Seth Jennings Cc: Weijie Yang --- While the rest of the patches in this set are v2, this is new for the set; previously a patch to implement zsmalloc shrinking was here, but that's removed. This patch instead changes the zbud_alloc() size parameter type from unsigned int to size_t, to be the same as the zsmalloc and zpool size param type. include/linux/zbud.h | 2 +- mm/zbud.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/include/linux/zbud.h b/include/linux/zbud.h index 0b2534e..1e9cb57 100644 --- a/include/linux/zbud.h +++ b/include/linux/zbud.h @@ -11,7 +11,7 @@ struct zbud_ops { struct zbud_pool *zbud_create_pool(gfp_t gfp, struct zbud_ops *ops); void zbud_destroy_pool(struct zbud_pool *pool); -int zbud_alloc(struct zbud_pool *pool, unsigned int size, +int zbud_alloc(struct zbud_pool *pool, size_t size, unsigned long *handle); void zbud_free(struct zbud_pool *pool, unsigned long handle); int zbud_reclaim_page(struct zbud_pool *pool, unsigned int retries); diff --git a/mm/zbud.c b/mm/zbud.c index 847c01c..dd13665 100644 --- a/mm/zbud.c +++ b/mm/zbud.c @@ -123,7 +123,7 @@ enum buddy { }; /* Converts an allocation size in bytes to size in zbud chunks */ -static int size_to_chunks(int size) +static int size_to_chunks(size_t size) { return (size + CHUNK_SIZE - 1) >> CHUNK_SHIFT; } @@ -250,8 +250,7 @@ void zbud_destroy_pool(struct zbud_pool *pool) * -EINVAL if the @size is 0, or -ENOMEM if the pool was unable to * allocate a new page. */ -int zbud_alloc(struct zbud_pool *pool, unsigned int size, - unsigned long *handle) +int zbud_alloc(struct zbud_pool *pool, size_t size, unsigned long *handle) { int chunks, i, freechunks; struct zbud_header *zhdr = NULL; -- 1.8.3.1