| Message ID | 20240131065653.133965-1-chentao@kylinos.cn (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | nfsd: Simplify the allocation of slab caches in nfsd_file_cache_init | expand |
On Wed, 2024-01-31 at 14:56 +0800, Kunwu Chan wrote: > 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@kylinos.cn> > --- > fs/nfsd/filecache.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/fs/nfsd/filecache.c b/fs/nfsd/filecache.c > index 8d9f7b07e35b..f3a642fd0eca 100644 > --- a/fs/nfsd/filecache.c > +++ b/fs/nfsd/filecache.c > @@ -722,15 +722,13 @@ nfsd_file_cache_init(void) > return ret; > > ret = -ENOMEM; > - nfsd_file_slab = kmem_cache_create("nfsd_file", > - sizeof(struct nfsd_file), 0, 0, NULL); > + nfsd_file_slab = KMEM_CACHE(nfsd_file, 0); > if (!nfsd_file_slab) { > pr_err("nfsd: unable to create nfsd_file_slab\n"); > goto out_err; > } > > - nfsd_file_mark_slab = kmem_cache_create("nfsd_file_mark", > - sizeof(struct nfsd_file_mark), 0, 0, NULL); > + nfsd_file_mark_slab = KMEM_CACHE(nfsd_file_mark, 0); > if (!nfsd_file_mark_slab) { > pr_err("nfsd: unable to create nfsd_file_mark_slab\n"); > goto out_err; Sure, I guess: Acked-by: Jeff Layton <jlayton@kernel.org>
On Wed, Jan 31, 2024 at 02:56:53PM +0800, Kunwu Chan wrote: > 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@kylinos.cn> > --- > fs/nfsd/filecache.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/fs/nfsd/filecache.c b/fs/nfsd/filecache.c > index 8d9f7b07e35b..f3a642fd0eca 100644 > --- a/fs/nfsd/filecache.c > +++ b/fs/nfsd/filecache.c > @@ -722,15 +722,13 @@ nfsd_file_cache_init(void) > return ret; > > ret = -ENOMEM; > - nfsd_file_slab = kmem_cache_create("nfsd_file", > - sizeof(struct nfsd_file), 0, 0, NULL); > + nfsd_file_slab = KMEM_CACHE(nfsd_file, 0); > if (!nfsd_file_slab) { > pr_err("nfsd: unable to create nfsd_file_slab\n"); > goto out_err; > } > > - nfsd_file_mark_slab = kmem_cache_create("nfsd_file_mark", > - sizeof(struct nfsd_file_mark), 0, 0, NULL); > + nfsd_file_mark_slab = KMEM_CACHE(nfsd_file_mark, 0); > if (!nfsd_file_mark_slab) { > pr_err("nfsd: unable to create nfsd_file_mark_slab\n"); > goto out_err; > -- > 2.39.2 Applied to nfsd-next (for v6.9).
diff --git a/fs/nfsd/filecache.c b/fs/nfsd/filecache.c index 8d9f7b07e35b..f3a642fd0eca 100644 --- a/fs/nfsd/filecache.c +++ b/fs/nfsd/filecache.c @@ -722,15 +722,13 @@ nfsd_file_cache_init(void) return ret; ret = -ENOMEM; - nfsd_file_slab = kmem_cache_create("nfsd_file", - sizeof(struct nfsd_file), 0, 0, NULL); + nfsd_file_slab = KMEM_CACHE(nfsd_file, 0); if (!nfsd_file_slab) { pr_err("nfsd: unable to create nfsd_file_slab\n"); goto out_err; } - nfsd_file_mark_slab = kmem_cache_create("nfsd_file_mark", - sizeof(struct nfsd_file_mark), 0, 0, NULL); + nfsd_file_mark_slab = KMEM_CACHE(nfsd_file_mark, 0); if (!nfsd_file_mark_slab) { pr_err("nfsd: unable to create nfsd_file_mark_slab\n"); goto out_err;
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@kylinos.cn> --- fs/nfsd/filecache.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)