Merge tag 'dma-mapping-5.10-1' of git://git.infradead.org/users/hch/dma-mapping

[linux-2.6-microblaze.git] / fs / nfs / nfs42xattr.c

diff --git a/fs/nfs/nfs42xattr.c b/fs/nfs/nfs42xattr.c
index 8677799..b51424f 100644 (file)
--- a/fs/nfs/nfs42xattr.c
+++ b/fs/nfs/nfs42xattr.c
@@ -67,7 +67,6 @@ struct nfs4_xattr_bucket {
 
 struct nfs4_xattr_cache {
        struct kref ref;
-       spinlock_t hash_lock;   /* protects hashtable and lru */
        struct nfs4_xattr_bucket buckets[NFS4_XATTR_HASH_SIZE];
        struct list_head lru;
        struct list_head dispose;
@@ -882,7 +881,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 +975,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);
 }