Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-block.git] / fs / super.c

diff --git a/fs/super.c b/fs/super.c
index a87dc1b1ac924ca62cfa841a844ea5a6718ad5a5..b05cf47463d0c2347e8eca1597001f96dd2a97fc 100644 (file)
--- a/fs/super.c
+++ b/fs/super.c
@@ -69,7 +69,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);
@@ -369,7 +369,7 @@ static int grab_super(struct super_block *s) __releases(sb_lock)
 
 /*
  *     grab_super_passive - acquire a passive reference
- *     @s: reference we are trying to grab
+ *     @sb: reference we are trying to grab
  *
  *     Tries to acquire a passive reference. This is used in places where we
  *     cannot take an active reference but we need to ensure that the