Merge tag 'nfs-for-4.15-1' of git://git.linux-nfs.org/projects/anna/linux-nfs

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

diff --git a/fs/nfs/cache_lib.c b/fs/nfs/cache_lib.c
index b60627b..ef67295 100644 (file)
--- a/fs/nfs/cache_lib.c
+++ b/fs/nfs/cache_lib.c
@@ -67,7 +67,7 @@ out:
  */
 void nfs_cache_defer_req_put(struct nfs_cache_defer_req *dreq)
 {
-       if (atomic_dec_and_test(&dreq->count))
+       if (refcount_dec_and_test(&dreq->count))
                kfree(dreq);
 }
 
@@ -87,7 +87,7 @@ static struct cache_deferred_req *nfs_dns_cache_defer(struct cache_req *req)
 
        dreq = container_of(req, struct nfs_cache_defer_req, req);
        dreq->deferred_req.revisit = nfs_dns_cache_revisit;
-       atomic_inc(&dreq->count);
+       refcount_inc(&dreq->count);
 
        return &dreq->deferred_req;
 }
@@ -99,7 +99,7 @@ struct nfs_cache_defer_req *nfs_cache_defer_req_alloc(void)
        dreq = kzalloc(sizeof(*dreq), GFP_KERNEL);
        if (dreq) {
                init_completion(&dreq->completion);
-               atomic_set(&dreq->count, 1);
+               refcount_set(&dreq->count, 1);
                dreq->req.defer = nfs_dns_cache_defer;
        }
        return dreq;