summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorChristoph Lameter <clameter@sgi.com>2007-05-09 02:32:37 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-09 12:30:44 -0700
commitabcd08a6f564171ffa05bc77d1c2ba4cfa949653 (patch)
tree10760411326e881329851707e93aebd8c6782737 /mm
parenta87615b8f9e2349f6d3770af3d72fd6a41ab4239 (diff)
downloadlinux-stable-abcd08a6f564171ffa05bc77d1c2ba4cfa949653.tar.gz
linux-stable-abcd08a6f564171ffa05bc77d1c2ba4cfa949653.tar.bz2
linux-stable-abcd08a6f564171ffa05bc77d1c2ba4cfa949653.zip
SLUB: use check_valid_pointer in kmem_ptr_validate
We needlessly duplicate code. Also make check_valid_pointer inline. Signed-off-by: Christoph LAemter <clameter@sgi.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/slub.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/mm/slub.c b/mm/slub.c
index beac34a5e4fd..1832ae1ea536 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -405,9 +405,8 @@ static int check_bytes(u8 *start, unsigned int value, unsigned int bytes)
return 1;
}
-
-static int check_valid_pointer(struct kmem_cache *s, struct page *page,
- void *object)
+static inline int check_valid_pointer(struct kmem_cache *s,
+ struct page *page, const void *object)
{
void *base;
@@ -1796,13 +1795,7 @@ int kmem_ptr_validate(struct kmem_cache *s, const void *object)
/* No slab or wrong slab */
return 0;
- addr = page_address(page);
- if (object < addr || object >= addr + s->objects * s->size)
- /* Out of bounds */
- return 0;
-
- if ((object - addr) % s->size)
- /* Improperly aligned */
+ if (!check_valid_pointer(s, page, object))
return 0;
/*