From: Jens Axboe <axboe@kernel.dk>
Date: Wed, 21 Sep 2011 08:26:58 +0000 (+0200)
Subject: Fix merge error
X-Git-Tag: next-20110922~49^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fea0fa764c69232c6e178a31d5d4adfbde96c201;p=karo-tx-linux.git

Fix merge error

Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/block/blk-core.c b/block/blk-core.c
index 6ba04fd069bc..a99514191ce2 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1240,7 +1240,7 @@ void blk_queue_bio(struct request_queue *q, struct bio *bio)
 	 * any locks.
 	 */
 	if (attempt_plug_merge(current, q, bio, &request_count))
-		goto out;
+		return;
 
 	spin_lock_irq(q->queue_lock);