From 072bc44d38079f0d73611661481e96505366cc3f Mon Sep 17 00:00:00 2001
From: Jens Axboe <jens.axboe@oracle.com>
Date: Tue, 19 Dec 2006 08:34:17 +0100
Subject: [PATCH] --- yaml --- r: 44842 b: refs/heads/master c:
 9c9381f9425ab4d2f9f0458ae9525c18bc832f59 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/block/ll_rw_blk.c | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index f3e6dda9dc65..5edeb2bd5369 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1aa4f24fe96938cabe7a1e9da8bc3bfbd1dfe3fa
+refs/heads/master: 9c9381f9425ab4d2f9f0458ae9525c18bc832f59
diff --git a/trunk/block/ll_rw_blk.c b/trunk/block/ll_rw_blk.c
index 433797934bd5..5d472e47c125 100644
--- a/trunk/block/ll_rw_blk.c
+++ b/trunk/block/ll_rw_blk.c
@@ -2359,18 +2359,10 @@ static int __blk_rq_map_user(request_queue_t *q, struct request *rq,
 	 */
 	bio_get(bio);
 
-	/*
-	 * for most (all? don't know of any) queues we could
-	 * skip grabbing the queue lock here. only drivers with
-	 * funky private ->back_merge_fn() function could be
-	 * problematic.
-	 */
-	spin_lock_irq(q->queue_lock);
 	if (!rq->bio)
 		blk_rq_bio_prep(q, rq, bio);
 	else if (!ll_back_merge_fn(q, rq, bio)) {
 		ret = -EINVAL;
-		spin_unlock_irq(q->queue_lock);
 		goto unmap_bio;
 	} else {
 		rq->biotail->bi_next = bio;
@@ -2378,7 +2370,6 @@ static int __blk_rq_map_user(request_queue_t *q, struct request *rq,
 
 		rq->data_len += bio->bi_size;
 	}
-	spin_unlock_irq(q->queue_lock);
 
 	return bio->bi_size;