fs: consolidate {nr,free}_cached_objects args in shrink_control

[deliverable/linux.git] / fs / super.c

diff --git a/fs/super.c b/fs/super.c
index 4554ac257647b81cc651a253ee0d6e81b330763d..a2b735a42e74d7eb5aaa88b854714590ff636629 100644 (file)
--- a/fs/super.c
+++ b/fs/super.c
@@ -75,7 +75,7 @@ static unsigned long super_cache_scan(struct shrinker *shrink,
                return SHRINK_STOP;
 
        if (sb->s_op->nr_cached_objects)
-               fs_objects = sb->s_op->nr_cached_objects(sb, sc->nid);
+               fs_objects = sb->s_op->nr_cached_objects(sb, sc);
 
        inodes = list_lru_shrink_count(&sb->s_inode_lru, sc);
        dentries = list_lru_shrink_count(&sb->s_dentry_lru, sc);
@@ -97,9 +97,10 @@ static unsigned long super_cache_scan(struct shrinker *shrink,
        sc->nr_to_scan = inodes;
        freed += prune_icache_sb(sb, sc);
 
-       if (fs_objects)
-               freed += sb->s_op->free_cached_objects(sb, fs_objects,
-                                                      sc->nid);
+       if (fs_objects) {
+               sc->nr_to_scan = fs_objects;
+               freed += sb->s_op->free_cached_objects(sb, sc);
+       }
 
        drop_super(sb);
        return freed;
@@ -122,8 +123,7 @@ static unsigned long super_cache_count(struct shrinker *shrink,
         * s_op->nr_cached_objects().
         */
        if (sb->s_op && sb->s_op->nr_cached_objects)
-               total_objects = sb->s_op->nr_cached_objects(sb,
-                                                sc->nid);
+               total_objects = sb->s_op->nr_cached_objects(sb, sc);
 
        total_objects += list_lru_shrink_count(&sb->s_dentry_lru, sc);
        total_objects += list_lru_shrink_count(&sb->s_inode_lru, sc);