Commit 133d205a18b7a4d8cb52959c5310f6664277cf61
Committed by
Linus Torvalds
Linus Torvalds
1 parent
1a1d92c10d
Exists in
master
and in
4 other branches
[PATCH] Make kmem_cache_destroy() return void
un-, de-, -free, -destroy, -exit, etc functions should in general return void. Also, There is very little, say, filesystem driver code can do upon failed kmem_cache_destroy(). If it will be decided to BUG in this case, BUG should be put in generic code, instead. Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Showing 3 changed files with 5 additions and 8 deletions Side-by-side Diff
include/linux/slab.h
| ... | ... | @@ -60,7 +60,7 @@ |
| 60 | 60 | extern kmem_cache_t *kmem_cache_create(const char *, size_t, size_t, unsigned long, |
| 61 | 61 | void (*)(void *, kmem_cache_t *, unsigned long), |
| 62 | 62 | void (*)(void *, kmem_cache_t *, unsigned long)); |
| 63 | -extern int kmem_cache_destroy(kmem_cache_t *); | |
| 63 | +extern void kmem_cache_destroy(kmem_cache_t *); | |
| 64 | 64 | extern int kmem_cache_shrink(kmem_cache_t *); |
| 65 | 65 | extern void *kmem_cache_alloc(kmem_cache_t *, gfp_t); |
| 66 | 66 | extern void *kmem_cache_zalloc(struct kmem_cache *, gfp_t); |
| ... | ... | @@ -249,7 +249,7 @@ |
| 249 | 249 | unsigned long, |
| 250 | 250 | void (*)(void *, struct kmem_cache *, unsigned long), |
| 251 | 251 | void (*)(void *, struct kmem_cache *, unsigned long)); |
| 252 | -int kmem_cache_destroy(struct kmem_cache *c); | |
| 252 | +void kmem_cache_destroy(struct kmem_cache *c); | |
| 253 | 253 | void *kmem_cache_alloc(struct kmem_cache *c, gfp_t flags); |
| 254 | 254 | void *kmem_cache_zalloc(struct kmem_cache *, gfp_t); |
| 255 | 255 | void kmem_cache_free(struct kmem_cache *c, void *b); |
mm/slab.c
| ... | ... | @@ -2442,7 +2442,6 @@ |
| 2442 | 2442 | * @cachep: the cache to destroy |
| 2443 | 2443 | * |
| 2444 | 2444 | * Remove a struct kmem_cache object from the slab cache. |
| 2445 | - * Returns 0 on success. | |
| 2446 | 2445 | * |
| 2447 | 2446 | * It is expected this function will be called by a module when it is |
| 2448 | 2447 | * unloaded. This will remove the cache completely, and avoid a duplicate |
| ... | ... | @@ -2454,7 +2453,7 @@ |
| 2454 | 2453 | * The caller must guarantee that noone will allocate memory from the cache |
| 2455 | 2454 | * during the kmem_cache_destroy(). |
| 2456 | 2455 | */ |
| 2457 | -int kmem_cache_destroy(struct kmem_cache *cachep) | |
| 2456 | +void kmem_cache_destroy(struct kmem_cache *cachep) | |
| 2458 | 2457 | { |
| 2459 | 2458 | BUG_ON(!cachep || in_interrupt()); |
| 2460 | 2459 | |
| ... | ... | @@ -2475,7 +2474,7 @@ |
| 2475 | 2474 | list_add(&cachep->next, &cache_chain); |
| 2476 | 2475 | mutex_unlock(&cache_chain_mutex); |
| 2477 | 2476 | unlock_cpu_hotplug(); |
| 2478 | - return 1; | |
| 2477 | + return; | |
| 2479 | 2478 | } |
| 2480 | 2479 | |
| 2481 | 2480 | if (unlikely(cachep->flags & SLAB_DESTROY_BY_RCU)) |
| ... | ... | @@ -2483,7 +2482,6 @@ |
| 2483 | 2482 | |
| 2484 | 2483 | __kmem_cache_destroy(cachep); |
| 2485 | 2484 | unlock_cpu_hotplug(); |
| 2486 | - return 0; | |
| 2487 | 2485 | } |
| 2488 | 2486 | EXPORT_SYMBOL(kmem_cache_destroy); |
| 2489 | 2487 |
mm/slob.c
| ... | ... | @@ -270,10 +270,9 @@ |
| 270 | 270 | } |
| 271 | 271 | EXPORT_SYMBOL(kmem_cache_create); |
| 272 | 272 | |
| 273 | -int kmem_cache_destroy(struct kmem_cache *c) | |
| 273 | +void kmem_cache_destroy(struct kmem_cache *c) | |
| 274 | 274 | { |
| 275 | 275 | slob_free(c, sizeof(struct kmem_cache)); |
| 276 | - return 0; | |
| 277 | 276 | } |
| 278 | 277 | EXPORT_SYMBOL(kmem_cache_destroy); |
| 279 | 278 |