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

Commit 88c3bd70 authored by David Rientjes's avatar David Rientjes Committed by Linus Torvalds
Browse files

vmscan: print shrink_slab symbol name on negative shrinker objects 



When a shrinker has a negative number of objects to delete, the symbol
name of the shrinker should be printed, not shrink_slab.  This also makes
the error message slightly more informative.

Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: default avatarDavid Rientjes <rientjes@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 71aa653c

mm/vmscan.c

+3 −2
Original line number Diff line number Diff line
@@ -214,8 +214,9 @@ unsigned long shrink_slab(unsigned long scanned, gfp_t gfp_mask, 
		do_div(delta, lru_pages + 1);

		shrinker->nr += delta;

		if (shrinker->nr < 0) {

			printk(KERN_ERR "%s: nr=%ld\n",

					__func__, shrinker->nr);

			printk(KERN_ERR "shrink_slab: %pF negative objects to "

			       "delete nr=%ld\n",

			       shrinker->shrink, shrinker->nr);

			shrinker->nr = max_pass;

		}