Commit 771f8bc7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6

* 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
  slub: Fix a crash during slabinfo -v
parents 31c67c75 37d57443
...@@ -3401,13 +3401,13 @@ static int validate_slab(struct kmem_cache *s, struct page *page, ...@@ -3401,13 +3401,13 @@ static int validate_slab(struct kmem_cache *s, struct page *page,
for_each_free_object(p, s, page->freelist) { for_each_free_object(p, s, page->freelist) {
set_bit(slab_index(p, s, addr), map); set_bit(slab_index(p, s, addr), map);
if (!check_object(s, page, p, 0)) if (!check_object(s, page, p, SLUB_RED_INACTIVE))
return 0; return 0;
} }
for_each_object(p, s, addr, page->objects) for_each_object(p, s, addr, page->objects)
if (!test_bit(slab_index(p, s, addr), map)) if (!test_bit(slab_index(p, s, addr), map))
if (!check_object(s, page, p, 1)) if (!check_object(s, page, p, SLUB_RED_ACTIVE))
return 0; return 0;
return 1; return 1;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment