From 7991e6bbf10e9bf3f496b538e90883e4b95a6242 Mon Sep 17 00:00:00 2001
From: Brian Gerst <bgerst@didntduck.org>
Date: Fri, 21 Feb 2003 20:09:30 -0800
Subject: [PATCH] [PATCH] Fix up slabinfo code

Move printing the header to s_start, removing the need for the special
pointer value.
---
 mm/slab.c | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/mm/slab.c b/mm/slab.c
index 649f332c23983..dca957164326e 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -2194,10 +2194,19 @@ static void *s_start(struct seq_file *m, loff_t *pos)
 	struct list_head *p;
 
 	down(&cache_chain_sem);
-	if (!n)
-		return (void *)1;
+	if (!n) {
+		/*
+		 * Output format version, so at least we can change it
+		 * without _too_ many complaints.
+		 */
+		seq_puts(m, "slabinfo - version: 1.2"
+#if STATS
+				" (statistics)"
+#endif
+				"\n");
+	}
 	p = cache_chain.next;
-	while (--n) {
+	while (n--) {
 		p = p->next;
 		if (p == &cache_chain)
 			return NULL;
@@ -2209,8 +2218,6 @@ static void *s_next(struct seq_file *m, void *p, loff_t *pos)
 {
 	kmem_cache_t *cachep = p;
 	++*pos;
-	if (p == (void *)1)
-		return list_entry(cache_chain.next, kmem_cache_t, next);
 	return cachep->next.next == &cache_chain ? NULL
 		: list_entry(cachep->next.next, kmem_cache_t, next);
 }
@@ -2234,20 +2241,6 @@ static int s_show(struct seq_file *m, void *p)
 	mm_segment_t old_fs;
 	char tmp; 
 
-
-	if (p == (void*)1) {
-		/*
-		 * Output format version, so at least we can change it
-		 * without _too_ many complaints.
-		 */
-		seq_puts(m, "slabinfo - version: 1.2"
-#if STATS
-				" (statistics)"
-#endif
-				"\n");
-		return 0;
-	}
-
 	check_irq_on();
 	spin_lock_irq(&cachep->spinlock);
 	active_objs = 0;
-- 
2.53.0