Commit f3d8b53a authored Dec 02, 2009 by J. R. Okajima Committed by Pekka Enberg Dec 06, 2009

slab, kmemleak: stop calling kmemleak_erase() unconditionally

When the gotten object is NULL (probably due to ENOMEM), kmemleak_erase() is
unnecessary here, It just sets NULL to where already is NULL. Add a condition.

Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>

parent 648f4e3e

mm/slab.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -3109,6 +3109,7 @@ static inline void ____cache_alloc(struct kmem_cache cachep, gfp_t flags)
		* per-CPU caches is leaked, we need to make sure kmemleak doesn't
		* treat the array pointers as a reference to the object.
		*/
		if (objp)
		kmemleak_erase(&ac->entry[ac->avail]);
		return objp;
		}