Message ID | 1427827562-24256-1-git-send-email-kamal@canonical.com |
---|---|
State | New |
Headers | show |
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index b8fb8bf..e13e06d 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c @@ -3600,6 +3600,11 @@ retry: blkcg = bio_blkcg(bio); cfqg = cfq_lookup_create_cfqg(cfqd, blkcg); + if (!cfqg) { + cfqq = &cfqd->oom_cfqq; + goto out; + } + cfqq = cic_to_cfqq(cic, is_sync); /* @@ -3636,7 +3641,7 @@ retry: } else cfqq = &cfqd->oom_cfqq; } - +out: if (new_cfqq) kmem_cache_free(cfq_pool, new_cfqq);