projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
block
/
blk-cgroup.c
diff --git
a/block/blk-cgroup.c
b/block/blk-cgroup.c
index
d0b7703
..
3f6d39d
100644
(file)
--- a/
block/blk-cgroup.c
+++ b/
block/blk-cgroup.c
@@
-600,7
+600,7
@@
struct cftype blkcg_files[] = {
};
/**
};
/**
- * blkcg_
pre_destroy - cgroup pre_destroy
callback
+ * blkcg_
css_offline - cgroup css_offline
callback
* @cgroup: cgroup of interest
*
* This function is called when @cgroup is about to go away and responsible
* @cgroup: cgroup of interest
*
* This function is called when @cgroup is about to go away and responsible
@@
-610,7
+610,7
@@
struct cftype blkcg_files[] = {
*
* This is the blkcg counterpart of ioc_release_fn().
*/
*
* This is the blkcg counterpart of ioc_release_fn().
*/
-static
int blkcg_pre_destroy
(struct cgroup *cgroup)
+static
void blkcg_css_offline
(struct cgroup *cgroup)
{
struct blkcg *blkcg = cgroup_to_blkcg(cgroup);
{
struct blkcg *blkcg = cgroup_to_blkcg(cgroup);
@@
-632,10
+632,9
@@
static int blkcg_pre_destroy(struct cgroup *cgroup)
}
spin_unlock_irq(&blkcg->lock);
}
spin_unlock_irq(&blkcg->lock);
- return 0;
}
}
-static void blkcg_
destroy
(struct cgroup *cgroup)
+static void blkcg_
css_free
(struct cgroup *cgroup)
{
struct blkcg *blkcg = cgroup_to_blkcg(cgroup);
{
struct blkcg *blkcg = cgroup_to_blkcg(cgroup);
@@
-643,7
+642,7
@@
static void blkcg_destroy(struct cgroup *cgroup)
kfree(blkcg);
}
kfree(blkcg);
}
-static struct cgroup_subsys_state *blkcg_c
reate
(struct cgroup *cgroup)
+static struct cgroup_subsys_state *blkcg_c
ss_alloc
(struct cgroup *cgroup)
{
static atomic64_t id_seq = ATOMIC64_INIT(0);
struct blkcg *blkcg;
{
static atomic64_t id_seq = ATOMIC64_INIT(0);
struct blkcg *blkcg;
@@
-740,10
+739,10
@@
static int blkcg_can_attach(struct cgroup *cgrp, struct cgroup_taskset *tset)
struct cgroup_subsys blkio_subsys = {
.name = "blkio",
struct cgroup_subsys blkio_subsys = {
.name = "blkio",
- .create = blkcg_create,
+ .css_alloc = blkcg_css_alloc,
+ .css_offline = blkcg_css_offline,
+ .css_free = blkcg_css_free,
.can_attach = blkcg_can_attach,
.can_attach = blkcg_can_attach,
- .pre_destroy = blkcg_pre_destroy,
- .destroy = blkcg_destroy,
.subsys_id = blkio_subsys_id,
.base_cftypes = blkcg_files,
.module = THIS_MODULE,
.subsys_id = blkio_subsys_id,
.base_cftypes = blkcg_files,
.module = THIS_MODULE,