fs: nfs: return per memcg count for xattr shrinkers
Subsystems (3)
PATCH 1/1 fs: nfs: return per memcg count for xattr shrinkers
The list_lru_count() returns the pre node count, but the new xattr shrinkers are memcg aware, so the shrinkers should return per memcg count by calling list_lru_shrink_count() instead. Otherwise over-shrink might be experienced. The problem was spotted by visual code inspection.
Cc Trond Myklebust <[email protected]>
Cc Anna Schumaker <[email protected]>
Cc Frank van der Linden <[email protected]>
Signed-off-by Yang Shi <[email protected]>
--- fs/nfs/nfs42xattr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/nfs/nfs42xattr.c +2 -2
@@ -882,7 +882,7 @@ nfs4_xattr_cache_count(struct shrinker *shrink, struct shrink_control *sc) {unsigned long count; - count =list_lru_count (&nfs4_xattr_cache_lru); + count =list_lru_shrink_count (&nfs4_xattr_cache_lru, sc);return vfs_pressure_ratio (count); }
@@ -976,7 +976,7 @@ nfs4_xattr_entry_count(struct shrinker *shrink, struct shrink_control *sc) lru = (shrink == &nfs4_xattr_large_entry_shrinker) ? &nfs4_xattr_large_entry_lru : &nfs4_xattr_entry_lru; - count =list_lru_count (lru); + count =list_lru_shrink_count (lru, sc);return vfs_pressure_ratio (count); }
Signature · 1 line
2.26.2
Quoted 38 lines · Yang Shi
The
list_lru_count()returns the pre node count, but the new xattr shrinkers are memcg aware, so the shrinkers should return per memcg count by callinglist_lru_shrink_count()instead. Otherwise over-shrink might be experienced. The problem was spotted by visual code inspection.Cc Trond Myklebust <[email protected]>Cc Anna Schumaker <[email protected]>Cc Frank van der Linden <[email protected]>Signed-off-by Yang Shi <[email protected]>--- fs/nfs/nfs42xattr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)fs/nfs/nfs42xattr.c +2
-3@@ -882,7 +882,7 @@ nfs4_xattr_cache_count(struct shrinker *shrink, struct shrink_control *sc) {unsigned long count; - count =list_lru_count (&nfs4_xattr_cache_lru); + count =list_lru_shrink_count (&nfs4_xattr_cache_lru, sc);return vfs_pressure_ratio (count); }@@ -976,7 +976,7 @@ nfs4_xattr_entry_count(struct shrinker *shrink, struct shrink_control *sc) lru = (shrink == &nfs4_xattr_large_entry_shrinker) ? &nfs4_xattr_large_entry_lru : &nfs4_xattr_entry_lru; - count =list_lru_count (lru); + count =list_lru_shrink_count (lru, sc);return vfs_pressure_ratio (count); } --
Quoted 2 lines
2.26.2
Yep, thanks.
Reviewed-by Frank van der Linden <[email protected]>