X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=block%2Fblk-cgroup.c;h=aa84a3c1d41811cf6e0f80d9e9db7f338c856d17;hb=refs%2Fheads%2F10;hp=987361113ecd8cbbb49905ccc2655aae2c0a8c33;hpb=e4e5a975f4aedb0f9fbb39c26e2928efae51fe6d;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c index 987361113ecd..aa84a3c1d418 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c @@ -184,7 +184,7 @@ static struct blkcg_gq *blkg_create(struct blkcg *blkcg, goto err_free_blkg; } - wb_congested = wb_congested_get_create(&q->backing_dev_info, + wb_congested = wb_congested_get_create(q->backing_dev_info, blkcg->css.id, GFP_NOWAIT | __GFP_NOWARN); if (!wb_congested) { @@ -469,8 +469,8 @@ static int blkcg_reset_stats(struct cgroup_subsys_state *css, const char *blkg_dev_name(struct blkcg_gq *blkg) { /* some drivers (floppy) instantiate a queue w/o disk registered */ - if (blkg->q->backing_dev_info.dev) - return dev_name(blkg->q->backing_dev_info.dev); + if (blkg->q->backing_dev_info->dev) + return dev_name(blkg->q->backing_dev_info->dev); return NULL; } EXPORT_SYMBOL_GPL(blkg_dev_name);