From cd1b14542ffc5111760dee8e2eb92d10dec6f35e Mon Sep 17 00:00:00 2001 From: Christoph Lameter Date: Wed, 4 Sep 2013 16:35:35 +0000 Subject: slub: remove verify_mem_not_deleted() I do not see any user for this code in the tree. Signed-off-by: Christoph Lameter Signed-off-by: Pekka Enberg Signed-off-by: W4TCH0UT Conflicts: include/linux/slub_def.h Signed-off-by: W4TCH0UT --- include/linux/slub_def.h | 13 ------------- mm/slub.c | 37 ------------------------------------- 2 files changed, 50 deletions(-) diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h index ab1d4d123..46ce38d22 100644 --- a/include/linux/slub_def.h +++ b/include/linux/slub_def.h @@ -121,19 +121,6 @@ kmalloc_order(size_t size, gfp_t flags, unsigned int order) return ret; } -/** - * Calling this on allocated memory will check that the memory - * is expected to be in use, and print warnings if not. - */ -#ifdef CONFIG_SLUB_DEBUG -extern bool verify_mem_not_deleted(const void *x); -#else -static inline bool verify_mem_not_deleted(const void *x) -{ - return true; -} -#endif - #ifdef CONFIG_TRACING extern void * kmem_cache_alloc_trace(struct kmem_cache *s, gfp_t gfpflags, size_t size); diff --git a/mm/slub.c b/mm/slub.c index a5fb05c18..9dafbf560 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -3529,43 +3529,6 @@ size_t ksize(const void *object) } EXPORT_SYMBOL(ksize); -#ifdef CONFIG_SLUB_DEBUG -bool verify_mem_not_deleted(const void *x) -{ - struct page *page; - void *object = (void *)x; - unsigned long flags; - bool rv; - - if (unlikely(ZERO_OR_NULL_PTR(x))) - return false; - - local_irq_save(flags); - - page = virt_to_head_page(x); - if (unlikely(!PageSlab(page))) { - /* maybe it was from stack? */ - rv = true; - goto out_unlock; - } - - slab_lock(page); - if (on_freelist(page->slab_cache, page, object)) { - object_err(page->slab_cache, page, object, - "Object is on free-list"); - rv = false; - } else { - rv = true; - } - slab_unlock(page); - -out_unlock: - local_irq_restore(flags); - return rv; -} -EXPORT_SYMBOL(verify_mem_not_deleted); -#endif - void kfree(const void *x) { struct page *page; -- cgit v1.2.3