3 files changed, 8 insertions, 16 deletions

diff --git a/mm/slab.c b/mm/slab.c
index eae2d21cc14f..a2152a2573dd 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -4043,12 +4043,6 @@ ssize_t slabinfo_write(struct file *file, const char __user *buffer,
 
 #ifdef CONFIG_DEBUG_SLAB_LEAK
 
-static void *leaks_start(struct seq_file *m, loff_t *pos)
-{
-        mutex_lock(&slab_mutex);
-        return seq_list_start(&slab_caches, *pos);
-}
-
 static inline int add_caller(unsigned long *n, unsigned long v)
 {
         unsigned long *p;
@@ -4170,7 +4164,7 @@ static int leaks_show(struct seq_file *m, void *p)
 }
 
 static const struct seq_operations slabstats_op = {
-        .start = leaks_start,
+        .start = slab_start,
         .next = slab_next,
         .stop = slab_stop,
         .show = leaks_show,
diff --git a/mm/slab.h b/mm/slab.h
index ab019e63e3c2..53a55c70c409 100644
--- a/mm/slab.h
+++ b/mm/slab.h
@@ -357,6 +357,7 @@ static inline struct kmem_cache_node *get_node(struct kmem_cache *s, int node)
 
 #endif
 
+void *slab_start(struct seq_file *m, loff_t *pos);
 void *slab_next(struct seq_file *m, void *p, loff_t *pos);
 void slab_stop(struct seq_file *m, void *p);
 
diff --git a/mm/slab_common.c b/mm/slab_common.c
index dcdab81bd240..06aeaf091f21 100644
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@ -834,14 +834,9 @@ void print_slabinfo_header(struct seq_file *m)
         seq_putc(m, '\n');
 }
 
-static void *s_start(struct seq_file *m, loff_t *pos)
+void *slab_start(struct seq_file *m, loff_t *pos)
 {
-        loff_t n = *pos;
-
         mutex_lock(&slab_mutex);
-        if (!n)
-                print_slabinfo_header(m);
-
         return seq_list_start(&slab_caches, *pos);
 }
 
@@ -903,10 +898,12 @@ int cache_show(struct kmem_cache *s, struct seq_file *m)
         return 0;
 }
 
-static int s_show(struct seq_file *m, void *p)
+static int slab_show(struct seq_file *m, void *p)
 {
         struct kmem_cache *s = list_entry(p, struct kmem_cache, list);
 
+        if (p == slab_caches.next)
+                print_slabinfo_header(m);
         if (!is_root_cache(s))
                 return 0;
         return cache_show(s, m);
@@ -926,10 +923,10 @@ static int s_show(struct seq_file *m, void *p)
  * + further values on SMP and with statistics enabled
  */
 static const struct seq_operations slabinfo_op = {
-        .start = s_start,
+        .start = slab_start,
         .next = slab_next,
         .stop = slab_stop,
-        .show = s_show,
+        .show = slab_show,
 };
 
 static int slabinfo_open(struct inode *inode, struct file *file)