diff --git a/[refs] b/[refs] index 443a0d603d4d..78a0429a7dd9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7e69723fef8771a9d57bd27d36281d756130b4b5 +refs/heads/master: 4cbadbd16e2fb727f6926597e0a580829e6222f1 diff --git a/trunk/block/blk-ioc.c b/trunk/block/blk-ioc.c index b791022beef3..c898049dafd5 100644 --- a/trunk/block/blk-ioc.c +++ b/trunk/block/blk-ioc.c @@ -96,6 +96,9 @@ struct io_context *alloc_io_context(gfp_t gfp_flags, int node) INIT_RADIX_TREE(&ret->radix_root, GFP_ATOMIC | __GFP_HIGH); INIT_HLIST_HEAD(&ret->cic_list); ret->ioc_data = NULL; +#if defined(CONFIG_BLK_CGROUP) || defined(CONFIG_BLK_CGROUP_MODULE) + ret->cgroup_changed = 0; +#endif } return ret;