2019-05-27 12:09:52

by Peng Wang

Subject: [PATCH] block: use KMEM_CACHE macro

Use the preferred KMEM_CACHE helper for brevity.

Signed-off-by: Peng Wang <[email protected]>
---
block/blk-core.c | 3 +--
block/blk-ioc.c | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/block/blk-core.c b/block/blk-core.c
index 1bf83a0df0f6..841bf0b12755 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1789,8 +1789,7 @@ int __init blk_dev_init(void)
if (!kblockd_workqueue)
panic("Failed to create kblockd\n");

- blk_requestq_cachep = kmem_cache_create("request_queue",
- sizeof(struct request_queue), 0, SLAB_PANIC, NULL);
+ blk_requestq_cachep = KMEM_CACHE(request_queue, SLAB_PANIC);

#ifdef CONFIG_DEBUG_FS
blk_debugfs_root = debugfs_create_dir("block", NULL);
diff --git a/block/blk-ioc.c b/block/blk-ioc.c
index 5ed59ac6ae58..58c79aeca955 100644
--- a/block/blk-ioc.c
+++ b/block/blk-ioc.c
@@ -408,8 +408,7 @@ struct io_cq *ioc_create_icq(struct io_context *ioc, struct request_queue *q,

static int __init blk_ioc_init(void)
{
- iocontext_cachep = kmem_cache_create("blkdev_ioc",
- sizeof(struct io_context), 0, SLAB_PANIC, NULL);
+ iocontext_cachep = KMEM_CACHE(io_context, SLAB_PANIC);
return 0;
}
subsys_initcall(blk_ioc_init);
--
2.19.1

2019-05-28 19:29:53

by Omar Sandoval

Subject: Re: [PATCH] block: use KMEM_CACHE macro

On Mon, May 27, 2019 at 07:48:35PM +0800, Peng Wang wrote:
> From: Peng Wang <[email protected]>
>
> Use the preferred KMEM_CACHE helper for brevity.

Reviewed-by: Omar Sandoval <[email protected]>

> Signed-off-by: Peng Wang <[email protected]>
> ---
> block/blk-core.c | 3 +--
> block/blk-ioc.c | 3 +--
> 2 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/block/blk-core.c b/block/blk-core.c
> index 1bf83a0df0f6..841bf0b12755 100644
> --- a/block/blk-core.c
> +++ b/block/blk-core.c
> @@ -1789,8 +1789,7 @@ int __init blk_dev_init(void)
> if (!kblockd_workqueue)
> panic("Failed to create kblockd\n");
>
> - blk_requestq_cachep = kmem_cache_create("request_queue",
> - sizeof(struct request_queue), 0, SLAB_PANIC, NULL);
> + blk_requestq_cachep = KMEM_CACHE(request_queue, SLAB_PANIC);
>
> #ifdef CONFIG_DEBUG_FS
> blk_debugfs_root = debugfs_create_dir("block", NULL);
> diff --git a/block/blk-ioc.c b/block/blk-ioc.c
> index 5ed59ac6ae58..58c79aeca955 100644
> --- a/block/blk-ioc.c
> +++ b/block/blk-ioc.c
> @@ -408,8 +408,7 @@ struct io_cq *ioc_create_icq(struct io_context *ioc, struct request_queue *q,
>
> static int __init blk_ioc_init(void)
> {
> - iocontext_cachep = kmem_cache_create("blkdev_ioc",
> - sizeof(struct io_context), 0, SLAB_PANIC, NULL);
> + iocontext_cachep = KMEM_CACHE(io_context, SLAB_PANIC);

This will change the name of the slab in slabinfo, but I can't imagine
that matters.

> return 0;
> }
> subsys_initcall(blk_ioc_init);
> --
> 2.19.1
>

2019-05-28 21:02:01

by Chaitanya Kulkarni

Subject: Re: [PATCH] block: use KMEM_CACHE macro

Thanks for your patch.

It also makes the cache name consistent with the structure name.
Looks good.

Reviewed-by: Chaitanya Kulkarni <[email protected]>

On 05/27/2019 04:50 AM, Peng Wang wrote:
> From: Peng Wang <[email protected]>
>
> Use the preferred KMEM_CACHE helper for brevity.
>
> Signed-off-by: Peng Wang <[email protected]>
> ---
> block/blk-core.c | 3 +--
> block/blk-ioc.c | 3 +--
> 2 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/block/blk-core.c b/block/blk-core.c
> index 1bf83a0df0f6..841bf0b12755 100644
> --- a/block/blk-core.c
> +++ b/block/blk-core.c
> @@ -1789,8 +1789,7 @@ int __init blk_dev_init(void)
> if (!kblockd_workqueue)
> panic("Failed to create kblockd\n");
>
> - blk_requestq_cachep = kmem_cache_create("request_queue",
> - sizeof(struct request_queue), 0, SLAB_PANIC, NULL);
> + blk_requestq_cachep = KMEM_CACHE(request_queue, SLAB_PANIC);
>
> #ifdef CONFIG_DEBUG_FS
> blk_debugfs_root = debugfs_create_dir("block", NULL);
> diff --git a/block/blk-ioc.c b/block/blk-ioc.c
> index 5ed59ac6ae58..58c79aeca955 100644
> --- a/block/blk-ioc.c
> +++ b/block/blk-ioc.c
> @@ -408,8 +408,7 @@ struct io_cq *ioc_create_icq(struct io_context *ioc, struct request_queue *q,
>
> static int __init blk_ioc_init(void)
> {
> - iocontext_cachep = kmem_cache_create("blkdev_ioc",
> - sizeof(struct io_context), 0, SLAB_PANIC, NULL);
> + iocontext_cachep = KMEM_CACHE(io_context, SLAB_PANIC);
> return 0;
> }
> subsys_initcall(blk_ioc_init);
>