From e7046ea382ff8e24e6f678ba6985f5dc64f4a532 Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@tv-sign.ru>
Date: Tue, 23 Oct 2007 15:08:21 +0200
Subject: [PATCH] --- yaml --- r: 72706 b: refs/heads/master c:
 0a0836a09ca7a27341703ef154c82e2e7f3e96f4 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/block/cfq-iosched.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 473b0e9bce15..43750a221c2f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: abbeb88d00bef294ce661a9229c1dc31be064545
+refs/heads/master: 0a0836a09ca7a27341703ef154c82e2e7f3e96f4
diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c
index d77c9719b613..e47a9309eb48 100644
--- a/trunk/block/cfq-iosched.c
+++ b/trunk/block/cfq-iosched.c
@@ -1443,8 +1443,11 @@ cfq_get_queue(struct cfq_data *cfqd, int is_sync, struct task_struct *tsk,
 		cfqq = *async_cfqq;
 	}
 
-	if (!cfqq)
+	if (!cfqq) {
 		cfqq = cfq_find_alloc_queue(cfqd, is_sync, tsk, gfp_mask);
+		if (!cfqq)
+			return NULL;
+	}
 
 	/*
 	 * pin the queue now that it's allocated, scheduler exit will prune it