On Wed, Jan 31, 2024 at 02:22:27PM +0800, Kunwu Chan wrote:
> commit 0a31bd5f2bbb ("KMEM_CACHE(): simplify slab cache creation")
> introduces a new macro.
> Use the new KMEM_CACHE() macro instead of direct kmem_cache_create
> to simplify the creation of SLAB caches.
>
> Signed-off-by: Kunwu Chan <chentao@xxxxxxxxxx>
> ---
> fs/nfsd/nfs4layouts.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/fs/nfsd/nfs4layouts.c b/fs/nfsd/nfs4layouts.c
> index 5e8096bc5eaa..4116695e6aa3 100644
> --- a/fs/nfsd/nfs4layouts.c
> +++ b/fs/nfsd/nfs4layouts.c
> @@ -756,13 +756,11 @@ nfsd4_init_pnfs(void)
> for (i = 0; i < DEVID_HASH_SIZE; i++)
> INIT_LIST_HEAD(&nfsd_devid_hash[i]);
>
> - nfs4_layout_cache = kmem_cache_create("nfs4_layout",
> - sizeof(struct nfs4_layout), 0, 0, NULL);
> + nfs4_layout_cache = KMEM_CACHE(nfs4_layout, 0);
> if (!nfs4_layout_cache)
> return -ENOMEM;
>
> - nfs4_layout_stateid_cache = kmem_cache_create("nfs4_layout_stateid",
> - sizeof(struct nfs4_layout_stateid), 0, 0, NULL);
> + nfs4_layout_stateid_cache = KMEM_CACHE(nfs4_layout_stateid, 0);
> if (!nfs4_layout_stateid_cache) {
> kmem_cache_destroy(nfs4_layout_cache);
> return -ENOMEM;
> --
> 2.39.2
Applied to nfsd-next (for v6.9).
--
Chuck Lever
