Received-SPF: pass (google.com: domain of linux-nfs+bounces-1688-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
From: Kunwu Chan <chentao@kylinos.cn>
To: chuck.lever@oracle.com,
	jlayton@kernel.org,
	neilb@suse.de,
	kolga@netapp.com,
	Dai.Ngo@oracle.com,
	tom@talpey.com
Cc: linux-nfs@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	Kunwu Chan <chentao@kylinos.cn>
Subject: [PATCH] nfsd: Simplify the allocation of slab caches in nfsd4_init_slabs
Date: Thu,  1 Feb 2024 16:37:52 +0800
Message-Id: <20240201083752.201727-1-chentao@kylinos.cn>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Use the new KMEM_CACHE() macro instead of direct kmem_cache_create
to simplify the creation of SLAB caches.
Make the code cleaner and more readable.

Signed-off-by: Kunwu Chan <chentao@kylinos.cn>
---
 fs/nfsd/nfs4state.c | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index d7d561b29fb0..6ac343a5d9db 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -4352,32 +4352,25 @@ nfsd4_free_slabs(void)
 int
 nfsd4_init_slabs(void)
 {
-	client_slab =3D kmem_cache_create("nfsd4_clients",
-			sizeof(struct nfs4_client), 0, 0, NULL);
+	client_slab =3D KMEM_CACHE(nfs4_client, 0);
 	if (client_slab =3D=3D NULL)
 		goto out;
-	openowner_slab =3D kmem_cache_create("nfsd4_openowners",
-			sizeof(struct nfs4_openowner), 0, 0, NULL);
+	openowner_slab =3D KMEM_CACHE(nfs4_openowner, 0);
 	if (openowner_slab =3D=3D NULL)
 		goto out_free_client_slab;
-	lockowner_slab =3D kmem_cache_create("nfsd4_lockowners",
-			sizeof(struct nfs4_lockowner), 0, 0, NULL);
+	lockowner_slab =3D KMEM_CACHE(nfs4_lockowner, 0);
 	if (lockowner_slab =3D=3D NULL)
 		goto out_free_openowner_slab;
-	file_slab =3D kmem_cache_create("nfsd4_files",
-			sizeof(struct nfs4_file), 0, 0, NULL);
+	file_slab =3D KMEM_CACHE(nfs4_file, 0);
 	if (file_slab =3D=3D NULL)
 		goto out_free_lockowner_slab;
-	stateid_slab =3D kmem_cache_create("nfsd4_stateids",
-			sizeof(struct nfs4_ol_stateid), 0, 0, NULL);
+	stateid_slab =3D KMEM_CACHE(nfs4_ol_stateid, 0);
 	if (stateid_slab =3D=3D NULL)
 		goto out_free_file_slab;
-	deleg_slab =3D kmem_cache_create("nfsd4_delegations",
-			sizeof(struct nfs4_delegation), 0, 0, NULL);
+	deleg_slab =3D KMEM_CACHE(nfs4_delegation, 0);
 	if (deleg_slab =3D=3D NULL)
 		goto out_free_stateid_slab;
-	odstate_slab =3D kmem_cache_create("nfsd4_odstate",
-			sizeof(struct nfs4_clnt_odstate), 0, 0, NULL);
+	odstate_slab =3D KMEM_CACHE(nfs4_clnt_odstate, 0);
 	if (odstate_slab =3D=3D NULL)
 		goto out_free_deleg_slab;
 	return 0;
--=20
2.39.2