From: Pekka Enberg <penberg@cs.helsinki.fi>

This patch renames the obj_reallen() function to obj_size() which makes the
code more readable.

Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 mm/slab.c |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)

diff -puN mm/slab.c~slab-rename-obj_reallen-to-obj_size mm/slab.c
--- devel/mm/slab.c~slab-rename-obj_reallen-to-obj_size	2005-11-18 18:53:04.000000000 -0800
+++ devel-akpm/mm/slab.c	2005-11-18 18:53:04.000000000 -0800
@@ -509,7 +509,7 @@ static int obj_dbghead(kmem_cache_t *cac
 	return cachep->dbghead;
 }
 
-static int obj_reallen(kmem_cache_t *cachep)
+static int obj_size(kmem_cache_t *cachep)
 {
 	return cachep->reallen;
 }
@@ -537,7 +537,12 @@ static void **dbg_userword(kmem_cache_t 
 #else
 
 #define obj_dbghead(x)			0
-#define obj_reallen(cachep)		(cachep->objsize)
+
+static int obj_size(kmem_cache_t *cachep)
+{
+	return cachep->objsize;
+}
+
 #define dbg_redzone1(cachep, objp)	({BUG(); (unsigned long *)NULL;})
 #define dbg_redzone2(cachep, objp)	({BUG(); (unsigned long *)NULL;})
 #define dbg_userword(cachep, objp)	({BUG(); (void **)NULL;})
@@ -1262,7 +1267,7 @@ static void kmem_rcu_free(struct rcu_hea
 static void store_stackinfo(kmem_cache_t *cachep, unsigned long *addr,
 				unsigned long caller)
 {
-	int size = obj_reallen(cachep);
+	int size = obj_size(cachep);
 
 	addr = (unsigned long *)&((char*)addr)[obj_dbghead(cachep)];
 
@@ -1294,7 +1299,7 @@ static void store_stackinfo(kmem_cache_t
 
 static void poison_obj(kmem_cache_t *cachep, void *addr, unsigned char val)
 {
-	int size = obj_reallen(cachep);
+	int size = obj_size(cachep);
 	addr = &((char*)addr)[obj_dbghead(cachep)];
 
 	memset(addr, val, size);
@@ -1333,7 +1338,7 @@ static void print_objinfo(kmem_cache_t *
 		printk("\n");
 	}
 	realobj = (char*)objp+obj_dbghead(cachep);
-	size = obj_reallen(cachep);
+	size = obj_size(cachep);
 	for (i=0; i<size && lines;i+=16, lines--) {
 		int limit;
 		limit = 16;
@@ -1350,7 +1355,7 @@ static void check_poison_obj(kmem_cache_
 	int lines = 0;
 
 	realobj = (char*)objp+obj_dbghead(cachep);
-	size = obj_reallen(cachep);
+	size = obj_size(cachep);
 
 	for (i=0;i<size;i++) {
 		char exp = POISON_FREE;
@@ -3081,7 +3086,7 @@ EXPORT_SYMBOL(free_percpu);
 
 unsigned int kmem_cache_size(kmem_cache_t *cachep)
 {
-	return obj_reallen(cachep);
+	return obj_size(cachep);
 }
 EXPORT_SYMBOL(kmem_cache_size);
 
@@ -3619,7 +3624,7 @@ unsigned int ksize(const void *objp)
 	if (unlikely(objp == NULL))
 		return 0;
 
-	return obj_reallen(page_get_cache(virt_to_page(objp)));
+	return obj_size(page_get_cache(virt_to_page(objp)));
 }
 
 
_