diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2013-09-12 21:54:48 (GMT) |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-09-12 21:54:48 (GMT) |
| commit | bf2ba3bc185269eca274b458aac46ba1ad7c1121 (patch) | |
| tree | 2cdaf7568df3ab762f42e7849fc9211dcb60d1bc /fs/xfs/xfs_super.c | |
| parent | bcceeeba9b3ca99c29523bb7af16727f8a837db4 (diff) | |
| parent | f5e1dd34561e0fb06400b378d595198918833021 (diff) | |
| download | linux-fsl-qoriq-bf2ba3bc185269eca274b458aac46ba1ad7c1121.tar.xz | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'fs/xfs/xfs_super.c')
| -rw-r--r-- | fs/xfs/xfs_super.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c index 979a77d..15188cc 100644 --- a/fs/xfs/xfs_super.c +++ b/fs/xfs/xfs_super.c @@ -1535,19 +1535,21 @@ xfs_fs_mount( return mount_bdev(fs_type, flags, dev_name, data, xfs_fs_fill_super); } -static int +static long xfs_fs_nr_cached_objects( - struct super_block *sb) + struct super_block *sb, + int nid) { return xfs_reclaim_inodes_count(XFS_M(sb)); } -static void +static long xfs_fs_free_cached_objects( struct super_block *sb, - int nr_to_scan) + long nr_to_scan, + int nid) { - xfs_reclaim_inodes_nr(XFS_M(sb), nr_to_scan); + return xfs_reclaim_inodes_nr(XFS_M(sb), nr_to_scan); } static const struct super_operations xfs_super_operations = { |