diff options
| author | Jens Axboe <axboe@fb.com> | 2017-02-03 07:53:55 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-02-03 07:53:55 -0700 |
| commit | f0c35c1e77830355eb2ef552db912de9a5b8c16e (patch) | |
| tree | 4e0cb0323444de017f485c06641c47da3dade50b /block | |
| parent | 5f8127b8db66e8b0aa6d9c0136c708c8ad6bb45c (diff) | |
| parent | 9b54d816e00425c3a517514e0d677bb3cec49258 (diff) | |
Merge branch 'for-4.11/next' into for-next
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-cgroup.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c index 37fe595cfd70..295e98c2c8cc 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c @@ -1079,10 +1079,8 @@ int blkcg_init_queue(struct request_queue *q) if (preloaded) radix_tree_preload_end(); - if (IS_ERR(blkg)) { - blkg_free(new_blkg); + if (IS_ERR(blkg)) return PTR_ERR(blkg); - } q->root_blkg = blkg; q->root_rl.blkg = blkg; |