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 <ddstreet@xxxxxxxx> Acked-by: Seth Jennings <sjennings@xxxxxxxxxxxxxx> Cc: Weijie Yang <weijie.yang@xxxxxxxxxxx> --- No change since v1 : https://lkml.org/lkml/2014/5/7/757 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 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxx. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>