Commit ed9887b8 authored by Julia Lawall's avatar Julia Lawall Committed by Chuck Lever
Browse files

nfsd: replace call_rcu by kfree_rcu for simple kmem_cache_free callback 



Since SLOB was removed and since
commit 6c6c47b0 ("mm, slab: call kvfree_rcu_barrier() from kmem_cache_destroy()"),
it is not necessary to use call_rcu when the callback only performs
kmem_cache_free. Use kfree_rcu() directly.

The changes were made using Coccinelle.

Signed-off-by: default avatarJulia Lawall <Julia.Lawall@inria.fr>
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Acked-by: default avatarPaul E. McKenney <paulmck@kernel.org>
Acked-by: default avatarVlastimil Babka <vbabka@suse.cz>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent a32442f6

fs/nfsd/nfs4state.c

+1 −8
Original line number Diff line number Diff line
@@ -572,13 +572,6 @@ opaque_hashval(const void *ptr, int nbytes) 
	return x;

}



static void nfsd4_free_file_rcu(struct rcu_head *rcu)

{

	struct nfs4_file *fp = container_of(rcu, struct nfs4_file, fi_rcu);



	kmem_cache_free(file_slab, fp);

}



void

put_nfs4_file(struct nfs4_file *fi)

{
@@ -586,7 +579,7 @@ put_nfs4_file(struct nfs4_file *fi) 
		nfsd4_file_hash_remove(fi);

		WARN_ON_ONCE(!list_empty(&fi->fi_clnt_odstate));

		WARN_ON_ONCE(!list_empty(&fi->fi_delegations));

		call_rcu(&fi->fi_rcu, nfsd4_free_file_rcu);

		kfree_rcu(fi, fi_rcu);

	}

}