diff options
author | Minchan Kim <minchan@kernel.org> | 2012-07-31 19:43:16 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-31 21:42:43 -0400 |
commit | 8e125cd85517c9716695b0abfabc0a4a3fcb94f3 (patch) | |
tree | ba146f3d6bf531730d1d977dceb2f195ddf23e5b /fs/super.c | |
parent | fe03025db3f4ade1f231b174938e0fe224722759 (diff) |
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>
Diffstat (limited to 'fs/super.c')
-rw-r--r-- | fs/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/super.c b/fs/super.c index 4c5d82f56ec4..4bf714459a4b 100644 --- a/fs/super.c +++ b/fs/super.c | |||
@@ -62,7 +62,7 @@ static int prune_super(struct shrinker *shrink, struct shrink_control *sc) | |||
62 | return -1; | 62 | return -1; |
63 | 63 | ||
64 | if (!grab_super_passive(sb)) | 64 | if (!grab_super_passive(sb)) |
65 | return !sc->nr_to_scan ? 0 : -1; | 65 | return -1; |
66 | 66 | ||
67 | if (sb->s_op && sb->s_op->nr_cached_objects) | 67 | if (sb->s_op && sb->s_op->nr_cached_objects) |
68 | fs_objects = sb->s_op->nr_cached_objects(sb); | 68 | fs_objects = sb->s_op->nr_cached_objects(sb); |