diff options
author | Dan Streetman <ddstreet@ieee.org> | 2014-08-06 19:08:33 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-06 21:01:23 -0400 |
commit | 99eef8e9369abe009006b4fa7f6ca5086c09cf46 (patch) | |
tree | 862786b7c5d4dfa06fb1b158eb58b5319a79cd55 | |
parent | d2d5e762c8990c4031890e03565983a05febd64a (diff) |
mm/zbud: change zbud_alloc size type to size_t
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@ieee.org>
Acked-by: Seth Jennings <sjennings@variantweb.net>
Tested-by: Seth Jennings <sjennings@variantweb.net>
Cc: Weijie Yang <weijie.yang@samsung.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Nitin Gupta <ngupta@vflare.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | include/linux/zbud.h | 2 | ||||
-rw-r--r-- | mm/zbud.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/zbud.h b/include/linux/zbud.h index 13af0d450bf6..f9d41a6e361f 100644 --- a/include/linux/zbud.h +++ b/include/linux/zbud.h | |||
@@ -11,7 +11,7 @@ struct zbud_ops { | |||
11 | 11 | ||
12 | struct zbud_pool *zbud_create_pool(gfp_t gfp, struct zbud_ops *ops); | 12 | struct zbud_pool *zbud_create_pool(gfp_t gfp, struct zbud_ops *ops); |
13 | void zbud_destroy_pool(struct zbud_pool *pool); | 13 | void zbud_destroy_pool(struct zbud_pool *pool); |
14 | int zbud_alloc(struct zbud_pool *pool, unsigned int size, gfp_t gfp, | 14 | int zbud_alloc(struct zbud_pool *pool, size_t size, gfp_t gfp, |
15 | unsigned long *handle); | 15 | unsigned long *handle); |
16 | void zbud_free(struct zbud_pool *pool, unsigned long handle); | 16 | void zbud_free(struct zbud_pool *pool, unsigned long handle); |
17 | int zbud_reclaim_page(struct zbud_pool *pool, unsigned int retries); | 17 | int zbud_reclaim_page(struct zbud_pool *pool, unsigned int retries); |
@@ -122,7 +122,7 @@ enum buddy { | |||
122 | }; | 122 | }; |
123 | 123 | ||
124 | /* Converts an allocation size in bytes to size in zbud chunks */ | 124 | /* Converts an allocation size in bytes to size in zbud chunks */ |
125 | static int size_to_chunks(int size) | 125 | static int size_to_chunks(size_t size) |
126 | { | 126 | { |
127 | return (size + CHUNK_SIZE - 1) >> CHUNK_SHIFT; | 127 | return (size + CHUNK_SIZE - 1) >> CHUNK_SHIFT; |
128 | } | 128 | } |
@@ -247,7 +247,7 @@ void zbud_destroy_pool(struct zbud_pool *pool) | |||
247 | * gfp arguments are invalid or -ENOMEM if the pool was unable to allocate | 247 | * gfp arguments are invalid or -ENOMEM if the pool was unable to allocate |
248 | * a new page. | 248 | * a new page. |
249 | */ | 249 | */ |
250 | int zbud_alloc(struct zbud_pool *pool, unsigned int size, gfp_t gfp, | 250 | int zbud_alloc(struct zbud_pool *pool, size_t size, gfp_t gfp, |
251 | unsigned long *handle) | 251 | unsigned long *handle) |
252 | { | 252 | { |
253 | int chunks, i, freechunks; | 253 | int chunks, i, freechunks; |