diff options
Diffstat (limited to 'block/cfq-iosched.c')
| -rw-r--r-- | block/cfq-iosched.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index d77c9719b613..e47a9309eb48 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c | |||
| @@ -1443,8 +1443,11 @@ cfq_get_queue(struct cfq_data *cfqd, int is_sync, struct task_struct *tsk, | |||
| 1443 | cfqq = *async_cfqq; | 1443 | cfqq = *async_cfqq; |
| 1444 | } | 1444 | } |
| 1445 | 1445 | ||
| 1446 | if (!cfqq) | 1446 | if (!cfqq) { |
| 1447 | cfqq = cfq_find_alloc_queue(cfqd, is_sync, tsk, gfp_mask); | 1447 | cfqq = cfq_find_alloc_queue(cfqd, is_sync, tsk, gfp_mask); |
| 1448 | if (!cfqq) | ||
| 1449 | return NULL; | ||
| 1450 | } | ||
| 1448 | 1451 | ||
| 1449 | /* | 1452 | /* |
| 1450 | * pin the queue now that it's allocated, scheduler exit will prune it | 1453 | * pin the queue now that it's allocated, scheduler exit will prune it |