From fea0fa764c69232c6e178a31d5d4adfbde96c201 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Wed, 21 Sep 2011 10:26:58 +0200 Subject: [PATCH] Fix merge error Signed-off-by: Jens Axboe --- block/blk-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); -- 2.39.5