projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'akpm' (patches from Andrew)
[firefly-linux-kernel-4.4.55.git]
/
fs
/
xfs
/
xfs_super.c
diff --git
a/fs/xfs/xfs_super.c
b/fs/xfs/xfs_super.c
index f2449fd869263b25461433c9af32f77d2b90fd96..8fcc4ccc5c791224e0d9325a5ad0557390a14d71 100644
(file)
--- a/
fs/xfs/xfs_super.c
+++ b/
fs/xfs/xfs_super.c
@@
-1537,7
+1537,7
@@
xfs_fs_mount(
static long
xfs_fs_nr_cached_objects(
struct super_block *sb,
static long
xfs_fs_nr_cached_objects(
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
xfs_fs_free_cached_objects(
struct super_block *sb,
static long
xfs_fs_free_cached_objects(
struct super_block *sb,
- long nr_to_scan,
- int nid)
+ struct shrink_control *sc)
{
{
- 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 = {