2016-11-10 16:16:41

by Tejun Heo

Subject: [PATCH] block: cfq_cpd_alloc() should use @gfp

Re: [bug report] blkcg: replace blkcg_policy->cpd_size with
->cpd_alloc/free_fn() methods
Reply-To:
In-Reply-To: <20161110133426.GA30610@mwanda>

cfq_cpd_alloc() which is the cpd_alloc_fn implementation for cfq was
incorrectly hard coding GFP_KERNEL instead of using the mask specified
through the @gfp parameter. This currently doesn't cause any actual
issues because all current callers specify GFP_KERNEL. Fix it.

Signed-off-by: Tejun Heo <[email protected]>
Reported-by: Dan Carpenter <[email protected]>
Fixes: e4a9bde9589f ("blkcg: replace blkcg_policy->cpd_size with ->cpd_alloc/free_fn() methods")
---
block/cfq-iosched.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 5e24d88..3ab6807 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -1596,7 +1596,7 @@ static struct blkcg_policy_data *cfq_cpd_alloc(gfp_t gfp)
{
struct cfq_group_data *cgd;

- cgd = kzalloc(sizeof(*cgd), GFP_KERNEL);
+ cgd = kzalloc(sizeof(*cgd), gfp);
if (!cgd)
return NULL;
return &cgd->cpd;

2016-11-10 17:10:31

by Jens Axboe

Subject: Re: [PATCH] block: cfq_cpd_alloc() should use @gfp

On 11/10/2016 09:16 AM, Tejun Heo wrote:
> Re: [bug report] blkcg: replace blkcg_policy->cpd_size with
> ->cpd_alloc/free_fn() methods
> Reply-To:
> In-Reply-To: <20161110133426.GA30610@mwanda>
>
> cfq_cpd_alloc() which is the cpd_alloc_fn implementation for cfq was
> incorrectly hard coding GFP_KERNEL instead of using the mask specified
> through the @gfp parameter. This currently doesn't cause any actual
> issues because all current callers specify GFP_KERNEL. Fix it.

Thanks Tejun, applied for 4.10.

--
Jens Axboe