summaryrefslogtreecommitdiff
path: root/block/cfq-iosched.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2016-11-10 19:16:37 +0300
committerJens Axboe <axboe@fb.com>2016-11-10 20:10:04 +0300
commitebc4ff661fbe76781c6b16dfb7b754a5d5073f8e (patch)
treeba0562eb2a24164629d6cbc90f864642ba507665 /block/cfq-iosched.c
parent7bf58533a0bc257edff883619befe7e5a1e8caca (diff)
downloadlinux-ebc4ff661fbe76781c6b16dfb7b754a5d5073f8e.tar.xz
block: cfq_cpd_alloc() should use @gfp
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 <tj@kernel.org> Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Fixes: e4a9bde9589f ("blkcg: replace blkcg_policy->cpd_size with ->cpd_alloc/free_fn() methods") Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block/cfq-iosched.c')
-rw-r--r--block/cfq-iosched.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index dcbed8c9c82c..61010511c5a0 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -1586,7 +1586,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;