mm/slub.c: Switch to bitmap_zalloc()
Subsystems (2)
PATCH 1/1 mm/slub.c: Switch to bitmap_zalloc()
Switch to bitmap_zalloc() to show clearly what we are allocating. Besides that it returns pointer of bitmap type instead of opaque void *.
Signed-off-by Andy Shevchenko <[email protected]>
--- mm/slub.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-)
mm/slub.c +7 -13
@@ -3622,9 +3622,7 @@ static void list_slab_objects(struct kmem_cache *s, struct page *page,#ifdef CONFIG_SLUB_DEBUG void *addr =page_address (page);void *p; -unsigned long *map =kcalloc (BITS_TO_LONGS (page->objects), -sizeof (long ), -GFP_ATOMIC ); +unsigned long *map =bitmap_zalloc (page->objects,GFP_ATOMIC );if (!map)return ;slab_err (s, page, text, s->name);
@@ -3639,7 +3637,7 @@ static void list_slab_objects(struct kmem_cache *s, struct page *page, } }slab_unlock (page); -kfree (map); +bitmap_free (map);#endif }
@@ -4412,10 +4410,8 @@ static long validate_slab_cache(struct kmem_cache *s) {int node;unsigned long count =0 ; -unsigned long *map =kmalloc_array (BITS_TO_LONGS (oo_objects (s->max)), -sizeof (unsigned long ), -GFP_KERNEL );struct kmem_cache_node *n; +unsigned long *map =bitmap_alloc (oo_objects (s->max),GFP_KERNEL );if (!map)return -ENOMEM ;
@@ -4423,7 +4419,7 @@ static long validate_slab_cache(struct kmem_cache *s)flush_all (s);for_each_kmem_cache_node (s, node, n) count +=validate_slab_node (s, n, map); -kfree (map); +bitmap_free (map);return count; }/*
@@ -4574,14 +4570,12 @@ static int list_locations(struct kmem_cache *s, char *buf,unsigned long i;struct loc_track t = {0 ,0 ,NULL };int node; -unsigned long *map =kmalloc_array (BITS_TO_LONGS (oo_objects (s->max)), -sizeof (unsigned long ), -GFP_KERNEL );struct kmem_cache_node *n; +unsigned long *map =bitmap_alloc (oo_objects (s->max),GFP_KERNEL );if (!map || !alloc_loc_track (&t,PAGE_SIZE /sizeof (struct location ),GFP_KERNEL )) { -kfree (map); +bitmap_free (map);return sprintf (buf,"Out of memory\n" ); }/* Push back cpu slabs */
@@ -4647,7 +4641,7 @@ static int list_locations(struct kmem_cache *s, char *buf, }free_loc_track (&t); -kfree (map); +bitmap_free (map);if (!t.count) len +=sprintf (buf,"No data\n" );return len;
Signature · 1 line
2.18.0
Quoted 4 lines · Andy Shevchenko
Switch to
bitmap_zalloc()to show clearly what we are allocating. Besides that it returns pointer of bitmap type instead of opaque void *.Signed-off-by Andy Shevchenko <[email protected]>
Tested-by David Rientjes <[email protected]>