From: Brian Behlendorf Date: Tue, 30 Sep 2014 18:51:53 +0000 (-0400) Subject: Remove sysctl_vfs_cache_pressure assumption X-Git-Tag: zfs-0.8.0-rc1~152^2~209^2~25 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aa363c5c0507ed660f57655211df1fe2c30b380e;p=zfs Remove sysctl_vfs_cache_pressure assumption The generic SPL cache shrinkers make the assumption that the caches only contain VFS cache data and therefore should be scaled based on vfs_cache_pressure. This is not strictly true and it should not be assumed. Removing this tuning should not have any impact on the stock behavior because vfs_cache_pressure=100 by default. This means that no scaling will take place. Signed-off-by: Brian Behlendorf --- diff --git a/module/spl/spl-kmem.c b/module/spl/spl-kmem.c index 79954eb2a..55b265696 100644 --- a/module/spl/spl-kmem.c +++ b/module/spl/spl-kmem.c @@ -2276,7 +2276,7 @@ __spl_kmem_cache_generic_shrinker(struct shrinker *shrink, if ((spl_kmem_cache_reclaim & KMC_RECLAIM_ONCE) && sc->nr_to_scan) return (-1); - return MAX((alloc * sysctl_vfs_cache_pressure) / 100, 0); + return (MAX(alloc, 0)); } SPL_SHRINKER_CALLBACK_WRAPPER(spl_kmem_cache_generic_shrinker);