leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
We are going to make FS shrinkers memcg-aware.  To achieve that, we will
have to pass the memcg to scan to the nr_cached_objects and
free_cached_objects VFS methods, which currently take only the NUMA node
to scan.  Since the shrink_control structure already holds the node, and
the memcg to scan will be added to it when we introduce memcg-aware
vmscan, let us consolidate the methods' arguments in this structure to
keep things clean.

Signed-off-by: Vladimir Davydov <vdavydov@parallels.com>
Suggested-by: Dave Chinner <david@fromorbit.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Greg Thelen <gthelen@google.com>
Cc: Glauber Costa <glommer@gmail.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Christoph Lameter <cl@linux.com>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: David Rientjes <rientjes@google.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Tejun Heo <tj@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Vladimir Davydov 2015-02-12 14:58:51 -08:00 committed by Linus Torvalds
parent 503c358cf1
commit 4101b62435
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fs/super.c
View File

@ -75,7 +75,7 @@ static unsigned long super_cache_scan(struct shrinker *shrink,
return SHRINK_STOP; return SHRINK_STOP;
if (sb->s_op->nr_cached_objects) 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); inodes = list_lru_shrink_count(&sb->s_inode_lru, sc);
dentries = list_lru_shrink_count(&sb->s_dentry_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; sc->nr_to_scan = inodes;
freed += prune_icache_sb(sb, sc); freed += prune_icache_sb(sb, sc);
if (fs_objects) if (fs_objects) {
freed += sb->s_op->free_cached_objects(sb, fs_objects, sc->nr_to_scan = fs_objects;
sc->nid); freed += sb->s_op->free_cached_objects(sb, sc);
}
drop_super(sb); drop_super(sb);
return freed; return freed;
@ -122,8 +123,7 @@ static unsigned long super_cache_count(struct shrinker *shrink,
* s_op->nr_cached_objects(). * s_op->nr_cached_objects().
*/ */
if (sb->s_op && sb->s_op->nr_cached_objects) 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);
sc->nid);
total_objects += list_lru_shrink_count(&sb->s_dentry_lru, sc); total_objects += list_lru_shrink_count(&sb->s_dentry_lru, sc);
total_objects += list_lru_shrink_count(&sb->s_inode_lru, sc); total_objects += list_lru_shrink_count(&sb->s_inode_lru, sc);

7
fs/xfs/xfs_super.c
View File

@ -1537,7 +1537,7 @@ xfs_fs_mount(
static long static long
xfs_fs_nr_cached_objects( xfs_fs_nr_cached_objects(
struct super_block *sb, struct super_block *sb,
int nid) struct shrink_control *sc)
{ {
return xfs_reclaim_inodes_count(XFS_M(sb)); return xfs_reclaim_inodes_count(XFS_M(sb));
} }
@ -1545,10 +1545,9 @@ xfs_fs_nr_cached_objects(
static long static long
xfs_fs_free_cached_objects( xfs_fs_free_cached_objects(
struct super_block *sb, struct super_block *sb,
long nr_to_scan, struct shrink_control *sc)
int nid)
{ {
return xfs_reclaim_inodes_nr(XFS_M(sb), nr_to_scan); return xfs_reclaim_inodes_nr(XFS_M(sb), sc->nr_to_scan);
} }
static const struct super_operations xfs_super_operations = { static const struct super_operations xfs_super_operations = {

6
include/linux/fs.h
View File

@ -1635,8 +1635,10 @@ struct super_operations {
struct dquot **(*get_dquots)(struct inode *); struct dquot **(*get_dquots)(struct inode *);
#endif #endif
int (*bdev_try_to_free_page)(struct super_block*, struct page*, gfp_t); int (*bdev_try_to_free_page)(struct super_block*, struct page*, gfp_t);
long (*nr_cached_objects)(struct super_block *, int); long (*nr_cached_objects)(struct super_block *,
long (*free_cached_objects)(struct super_block *, long, int); struct shrink_control *);
long (*free_cached_objects)(struct super_block *,
struct shrink_control *);
}; };
/* /*