]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Fix merge error
authorJens Axboe <axboe@kernel.dk>
Wed, 21 Sep 2011 08:26:58 +0000 (10:26 +0200)
committerJens Axboe <axboe@kernel.dk>
Wed, 21 Sep 2011 08:26:58 +0000 (10:26 +0200)
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/blk-core.c

index 6ba04fd069bcc95e476c04e2fe82bcd544edc0e9..a99514191ce28be9b101cd9d1d34eabc40b846b5 100644 (file)
@@ -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);