| From ebc4ff661fbe76781c6b16dfb7b754a5d5073f8e Mon Sep 17 00:00:00 2001 |
| From: Tejun Heo <tj@kernel.org> |
| Date: Thu, 10 Nov 2016 11:16:37 -0500 |
| Subject: block: cfq_cpd_alloc() should use @gfp |
| |
| From: Tejun Heo <tj@kernel.org> |
| |
| commit ebc4ff661fbe76781c6b16dfb7b754a5d5073f8e upstream. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| block/cfq-iosched.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/block/cfq-iosched.c |
| +++ b/block/cfq-iosched.c |
| @@ -1572,7 +1572,7 @@ static struct blkcg_policy_data *cfq_cpd |
| { |
| struct cfq_group_data *cgd; |
| |
| - cgd = kzalloc(sizeof(*cgd), GFP_KERNEL); |
| + cgd = kzalloc(sizeof(*cgd), gfp); |
| if (!cgd) |
| return NULL; |
| return &cgd->cpd; |
