Merge branch 'next/deletion' of git://git.linaro.org/people/arnd/arm-soc

[pandora-kernel.git] / fs / super.c

diff --git a/fs/super.c b/fs/super.c
index 3f56a26..32a81f3 100644 (file)
--- a/fs/super.c
+++ b/fs/super.c
@@ -61,7 +61,7 @@ static int prune_super(struct shrinker *shrink, struct shrink_control *sc)
                return -1;
 
        if (!grab_super_passive(sb))
-               return -1;
+               return !sc->nr_to_scan ? 0 : -1;
 
        if (sb->s_op && sb->s_op->nr_cached_objects)
                fs_objects = sb->s_op->nr_cached_objects(sb);