[PATCH] slab: extract slabinfo header printing to separate function

This patch extracts slabinfo header printing to a separate function
print_slabinfo_header() to make s_start() more readable.

Signed-off-by: Matthew Dobson <colpatch@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/mm/slab.c b/mm/slab.c
index eb70fddf2059ec99471dbbcea01ee49f32727b2a..3d3b5a46854f5dcfef4bf8a920c81c1101d05ac8 100644 (file)
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -3364,32 +3364,37 @@ next:
 
 #ifdef CONFIG_PROC_FS
 
-static void *s_start(struct seq_file *m, loff_t *pos)
+static void print_slabinfo_header(struct seq_file *m)
 {
-       loff_t n = *pos;
-       struct list_head *p;
-
-       down(&cache_chain_sem);
-       if (!n) {
-               /*
-                * Output format version, so at least we can change it
-                * without _too_ many complaints.
-                */
+       /*
+        * Output format version, so at least we can change it
+        * without _too_ many complaints.
+        */
 #if STATS
-               seq_puts(m, "slabinfo - version: 2.1 (statistics)\n");
+       seq_puts(m, "slabinfo - version: 2.1 (statistics)\n");
 #else
-               seq_puts(m, "slabinfo - version: 2.1\n");
+       seq_puts(m, "slabinfo - version: 2.1\n");
 #endif
-               seq_puts(m, "# name            <active_objs> <num_objs> <objsize> <objperslab> <pagesperslab>");
-               seq_puts(m, " : tunables <limit> <batchcount> <sharedfactor>");
-               seq_puts(m, " : slabdata <active_slabs> <num_slabs> <sharedavail>");
+       seq_puts(m, "# name            <active_objs> <num_objs> <objsize> "
+                "<objperslab> <pagesperslab>");
+       seq_puts(m, " : tunables <limit> <batchcount> <sharedfactor>");
+       seq_puts(m, " : slabdata <active_slabs> <num_slabs> <sharedavail>");
 #if STATS
-               seq_puts(m, " : globalstat <listallocs> <maxobjs> <grown> <reaped>"
-                               " <error> <maxfreeable> <nodeallocs> <remotefrees>");
-               seq_puts(m, " : cpustat <allochit> <allocmiss> <freehit> <freemiss>");
+       seq_puts(m, " : globalstat <listallocs> <maxobjs> <grown> <reaped> "
+                "<error> <maxfreeable> <nodeallocs> <remotefrees>");
+       seq_puts(m, " : cpustat <allochit> <allocmiss> <freehit> <freemiss>");
 #endif
-               seq_putc(m, '\n');
-       }
+       seq_putc(m, '\n');
+}
+
+static void *s_start(struct seq_file *m, loff_t *pos)
+{
+       loff_t n = *pos;
+       struct list_head *p;
+
+       down(&cache_chain_sem);
+       if (!n)
+               print_slabinfo_header(m);
        p = cache_chain.next;
        while (n--) {
                p = p->next;