Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85289f98 authored by Pekka Enberg's avatar Pekka Enberg Committed by Linus Torvalds
Browse files

[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: default avatarMatthew Dobson <colpatch@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f9f75005

mm/slab.c

+25 −20
Original line number Original line Diff line number Diff line
@@ -3364,13 +3364,8 @@ static void cache_reap(void *unused) 




#ifdef CONFIG_PROC_FS

#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

	 * Output format version, so at least we can change it

	 * without _too_ many complaints.

	 * without _too_ many complaints.
@@ -3380,7 +3375,8 @@ static void *s_start(struct seq_file *m, loff_t *pos) 
#else

#else

	seq_puts(m, "slabinfo - version: 2.1\n");

	seq_puts(m, "slabinfo - version: 2.1\n");

#endif

#endif

		seq_puts(m, "# name            <active_objs> <num_objs> <objsize> <objperslab> <pagesperslab>");

	seq_puts(m, "# name            <active_objs> <num_objs> <objsize> "

		 "<objperslab> <pagesperslab>");

	seq_puts(m, " : tunables <limit> <batchcount> <sharedfactor>");

	seq_puts(m, " : tunables <limit> <batchcount> <sharedfactor>");

	seq_puts(m, " : slabdata <active_slabs> <num_slabs> <sharedavail>");

	seq_puts(m, " : slabdata <active_slabs> <num_slabs> <sharedavail>");

#if STATS

#if STATS
@@ -3390,6 +3386,15 @@ static void *s_start(struct seq_file *m, loff_t *pos) 
#endif

#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;

	p = cache_chain.next;

	while (n--) {

	while (n--) {

		p = p->next;

		p = p->next;