Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Linux 3.12 compat: split shrinker has s_shrink 

The split count/scan shrinker callbacks introduced in 3.12 broke the
test for HAVE_SHRINK, effectively disabling the per-superblock shrinkers.

This patch re-enables the per-superblock shrinkers when the split shrinker
callbacks have been detected.

Signed-off-by: Tim Chase <tim@chase2k.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #2975
This commit is contained in:
Tim Chase 2014-12-18 10:08:47 -06:00 committed by Brian Behlendorf
parent 7b13354d55
commit 1817cb6dc6
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
module/zfs/zfs_vfsops.c
View File

@ -1073,7 +1073,7 @@ zfs_root(zfs_sb_t *zsb, struct inode **ipp)
}
EXPORT_SYMBOL(zfs_root);
#ifdef HAVE_SHRINK
#if defined(HAVE_SHRINK) || defined(HAVE_SPLIT_SHRINKER_CALLBACK)
int
zfs_sb_prune(struct super_block *sb, unsigned long nr_to_scan, int *objects)
{
@ -1085,13 +1085,17 @@ zfs_sb_prune(struct super_block *sb, unsigned long nr_to_scan, int *objects)
};
ZFS_ENTER(zsb);
#ifdef HAVE_SPLIT_SHRINKER_CALLBACK
*objects = (*shrinker->scan_objects)(shrinker, &sc);
#else
*objects = (*shrinker->shrink)(shrinker, &sc);
#endif
ZFS_EXIT(zsb);
return (0);
}
EXPORT_SYMBOL(zfs_sb_prune);
#endif /* HAVE_SHRINK */
#endif /* defined(HAVE_SHRINK) || defined(HAVE_SPLIT_SHRINKER_CALLBACK) */
/*
* Teardown the zfs_sb_t.

2
module/zfs/zpl_super.c
View File

@ -268,7 +268,7 @@ zpl_kill_sb(struct super_block *sb)
#endif /* HAVE_S_INSTANCES_LIST_HEAD */
}
#ifdef HAVE_SHRINK
#if defined(HAVE_SHRINK) || defined(HAVE_SPLIT_SHRINKER_CALLBACK)
/*
* Linux 3.1 - 3.x API
*