Merge 'for-linus' branch of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/axboe/linux-2.6-block (dfd11c2e) · Commits · e / devices / android_kernel_teracube_2e

drivers/block/cfq-iosched.c

+6 −3

Original line number	Diff line number	Diff line
		@@ -1202,14 +1202,17 @@ __cfq_get_queue(struct cfq_data *cfqd, unsigned long key, int gfp_mask)
		if (new_cfqq) {
		cfqq = new_cfqq;
		new_cfqq = NULL;
		} else if (gfp_mask & __GFP_WAIT) {
		} else {
		spin_unlock_irq(cfqd->queue->queue_lock);
		new_cfqq = kmem_cache_alloc(cfq_pool, gfp_mask);
		spin_lock_irq(cfqd->queue->queue_lock);
		goto retry;
		} else

		if (!new_cfqq && !(gfp_mask & __GFP_WAIT))
		goto out;

		goto retry;
		}

		memset(cfqq, 0, sizeof(*cfqq));

		INIT_HLIST_NODE(&cfqq->cfq_hash);