fs: convert inode and dentry shrinking to be node aware

Now that the shrinker is passing a node in the scan control structure, we
can pass this to the the generic LRU list code to isolate reclaim to the
lists on matching nodes.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Glauber Costa <glommer@parallels.com>
Acked-by: Mel Gorman <mgorman@suse.de>
Cc: "Theodore Ts'o" <tytso@mit.edu>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Cc: Arve Hjønnevåg <arve@android.com>
Cc: Carlos Maiolino <cmaiolino@redhat.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: David Rientjes <rientjes@google.com>
Cc: Gleb Natapov <gleb@redhat.com>
Cc: Greg Thelen <gthelen@google.com>
Cc: J. Bruce Fields <bfields@redhat.com>
Cc: Jan Kara <jack@suse.cz>
Cc: Jerome Glisse <jglisse@redhat.com>
Cc: John Stultz <john.stultz@linaro.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Kent Overstreet <koverstreet@google.com>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Steven Whitehouse <swhiteho@redhat.com>
Cc: Thomas Hellstrom <thellstrom@vmware.com>
Cc: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

1 files changed, 14 insertions, 9 deletions

diff --git a/fs/super.c b/fs/super.c
index cd3c2cd9144d..181d42e2abff 100644
--- a/fs/super.c
+++ b/fs/super.c
@@ -76,10 +76,10 @@ 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);
+                fs_objects = sb->s_op->nr_cached_objects(sb, sc->nid);
 
-        inodes = list_lru_count(&sb->s_inode_lru);
-        dentries = list_lru_count(&sb->s_dentry_lru);
+        inodes = list_lru_count_node(&sb->s_inode_lru, sc->nid);
+        dentries = list_lru_count_node(&sb->s_dentry_lru, sc->nid);
         total_objects = dentries + inodes + fs_objects + 1;
 
         /* proportion the scan between the caches */
@@ -90,13 +90,14 @@ static unsigned long super_cache_scan(struct shrinker *shrink,
          * prune the dcache first as the icache is pinned by it, then
          * prune the icache, followed by the filesystem specific caches
          */
-        freed = prune_dcache_sb(sb, dentries);
-        freed += prune_icache_sb(sb, inodes);
+        freed = prune_dcache_sb(sb, dentries, sc->nid);
+        freed += prune_icache_sb(sb, inodes, sc->nid);
 
         if (fs_objects) {
                 fs_objects = mult_frac(sc->nr_to_scan, fs_objects,
                                                                 total_objects);
-                freed += sb->s_op->free_cached_objects(sb, fs_objects);
+                freed += sb->s_op->free_cached_objects(sb, fs_objects,
+                                                       sc->nid);
         }
 
         drop_super(sb);
@@ -115,10 +116,13 @@ static unsigned long super_cache_count(struct shrinker *shrink,
                 return 0;
 
         if (sb->s_op && sb->s_op->nr_cached_objects)
-                total_objects = sb->s_op->nr_cached_objects(sb);
+                total_objects = sb->s_op->nr_cached_objects(sb,
+                                                 sc->nid);
 
-        total_objects += list_lru_count(&sb->s_dentry_lru);
-        total_objects += list_lru_count(&sb->s_inode_lru);
+        total_objects += list_lru_count_node(&sb->s_dentry_lru,
+                                                 sc->nid);
+        total_objects += list_lru_count_node(&sb->s_inode_lru,
+                                                 sc->nid);
 
         total_objects = vfs_pressure_ratio(total_objects);
         drop_super(sb);
@@ -228,6 +232,7 @@ static struct super_block *alloc_super(struct file_system_type *type, int flags)
                 s->s_shrink.scan_objects = super_cache_scan;
                 s->s_shrink.count_objects = super_cache_count;
                 s->s_shrink.batch = 1024;
+                s->s_shrink.flags = SHRINKER_NUMA_AWARE;
         }
 out:
         return s;