Commit 8e125cd8 authored Jul 31, 2012 by Minchan Kim Committed by Linus Torvalds Jul 31, 2012

vmscan: remove obsolete shrink_control comment



09f363c7 ("vmscan: fix shrinker callback bug in fs/super.c") fixed a
shrinker callback which was returning -1 when nr_to_scan is zero, which
caused excessive slab scanning.  But 635697c6 ("vmscan: fix initial
shrinker size handling") fixed the problem, again so we can freely return
-1 although nr_to_scan is zero.  So let's revert 09f363c7 because the
comment added in 09f363c7 made an unnecessary rule.

Signed-off-by: Minchan Kim <minchan@kernel.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Mikulas Patocka <mpatocka@redhat.com>
Cc: Konstantin Khlebnikov <khlebnikov@openvz.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent fe03025d

fs/super.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -62,7 +62,7 @@ static int prune_super(struct shrinker shrink, struct shrink_control sc)
		return -1;

		if (!grab_super_passive(sb))
		return !sc->nr_to_scan ? 0 : -1;
		return -1;

		if (sb->s_op && sb->s_op->nr_cached_objects)
		fs_objects = sb->s_op->nr_cached_objects(sb);

include/linux/shrinker.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@ struct shrink_control {
		* 'nr_to_scan' entries and attempt to free them up. It should return
		* the number of objects which remain in the cache. If it returns -1, it means
		* it cannot do any scanning at this time (eg. there is a risk of deadlock).
		* The callback must not return -1 if nr_to_scan is zero.
		*
		* The 'gfpmask' refers to the allocation we are currently trying to
		* fulfil.

Admin message