Revert "FROMLIST: mm: clean up validate_slab()"
This reverts commit 25c1b742fecc65a8f823bda9cc126a5ad8c4d3a7.
This commit is contained in:
parent
b9053d8550
commit
0a909c8494
21
mm/slub.c
21
mm/slub.c
@ -4458,26 +4458,31 @@ static int count_total(struct page *page)
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_SLUB_DEBUG
|
||||
static void validate_slab(struct kmem_cache *s, struct page *page,
|
||||
static int validate_slab(struct kmem_cache *s, struct page *page,
|
||||
unsigned long *map)
|
||||
{
|
||||
void *p;
|
||||
void *addr = page_address(page);
|
||||
|
||||
if (!check_slab(s, page) || !on_freelist(s, page, NULL))
|
||||
return;
|
||||
if (!check_slab(s, page) ||
|
||||
!on_freelist(s, page, NULL))
|
||||
return 0;
|
||||
|
||||
/* Now we know that a valid freelist exists */
|
||||
bitmap_zero(map, page->objects);
|
||||
|
||||
get_map(s, page, map);
|
||||
for_each_object(p, s, addr, page->objects) {
|
||||
u8 val = test_bit(slab_index(p, s, addr), map) ?
|
||||
SLUB_RED_INACTIVE : SLUB_RED_ACTIVE;
|
||||
|
||||
if (!check_object(s, page, p, val))
|
||||
break;
|
||||
if (test_bit(slab_index(p, s, addr), map))
|
||||
if (!check_object(s, page, p, SLUB_RED_INACTIVE))
|
||||
return 0;
|
||||
}
|
||||
|
||||
for_each_object(p, s, addr, page->objects)
|
||||
if (!test_bit(slab_index(p, s, addr), map))
|
||||
if (!check_object(s, page, p, SLUB_RED_ACTIVE))
|
||||
return 0;
|
||||
return 1;
|
||||
}
|
||||
|
||||
static void validate_slab_slab(struct kmem_cache *s, struct page *page,
|
||||
|
Loading…
Reference in New Issue
Block a user