aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/cgroup.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2014-09-07 20:51:30 -0400
committerTejun Heo <tj@kernel.org>2014-09-07 20:51:30 -0400
commita34375ef9e65340a138fc0be287de5c940d260fc (patch)
tree2e21b63d7c9240620a59090aa97e1d7c6df95b8c /kernel/cgroup.c
parent20ae00792c6f1f18fc4fc5965445a145df92827e (diff)
percpu-refcount: add @gfp to percpu_ref_init()
Percpu allocator now supports allocation mask. Add @gfp to percpu_ref_init() so that !GFP_KERNEL allocation masks can be used with percpu_refs too. This patch doesn't make any functional difference. v2: blk-mq conversion was missing. Updated. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Kent Overstreet <koverstreet@google.com> Cc: Benjamin LaHaise <bcrl@kvack.org> Cc: Li Zefan <lizefan@huawei.com> Cc: Nicholas A. Bellinger <nab@linux-iscsi.org> Cc: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'kernel/cgroup.c')
-rw-r--r--kernel/cgroup.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 7dc8788cfd52..589b4d89a0a5 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -1628,7 +1628,7 @@ static int cgroup_setup_root(struct cgroup_root *root, unsigned int ss_mask)
1628 goto out; 1628 goto out;
1629 root_cgrp->id = ret; 1629 root_cgrp->id = ret;
1630 1630
1631 ret = percpu_ref_init(&root_cgrp->self.refcnt, css_release); 1631 ret = percpu_ref_init(&root_cgrp->self.refcnt, css_release, GFP_KERNEL);
1632 if (ret) 1632 if (ret)
1633 goto out; 1633 goto out;
1634 1634
@@ -4487,7 +4487,7 @@ static int create_css(struct cgroup *cgrp, struct cgroup_subsys *ss,
4487 4487
4488 init_and_link_css(css, ss, cgrp); 4488 init_and_link_css(css, ss, cgrp);
4489 4489
4490 err = percpu_ref_init(&css->refcnt, css_release); 4490 err = percpu_ref_init(&css->refcnt, css_release, GFP_KERNEL);
4491 if (err) 4491 if (err)
4492 goto err_free_css; 4492 goto err_free_css;
4493 4493
@@ -4555,7 +4555,7 @@ static int cgroup_mkdir(struct kernfs_node *parent_kn, const char *name,
4555 goto out_unlock; 4555 goto out_unlock;
4556 } 4556 }
4557 4557
4558 ret = percpu_ref_init(&cgrp->self.refcnt, css_release); 4558 ret = percpu_ref_init(&cgrp->self.refcnt, css_release, GFP_KERNEL);
4559 if (ret) 4559 if (ret)
4560 goto out_free_cgrp; 4560 goto out_free_cgrp;
4561 4561