# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.571   -> 1.572  
#	drivers/scsi/scsi_lib.c	1.29    -> 1.30   
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/09/18	axboe@burns.home.kernel.dk	1.572
# scsi does not need locks around end_that_request_first()
# --------------------------------------------
#
diff -Nru a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
--- a/drivers/scsi/scsi_lib.c	Wed Sep 18 16:36:10 2002
+++ b/drivers/scsi/scsi_lib.c	Wed Sep 18 16:36:10 2002
@@ -317,13 +317,11 @@
 
 	ASSERT_LOCK(q->queue_lock, 0);
 
-	spin_lock_irqsave(q->queue_lock, flags);
 	/*
 	 * If there are blocks left over at the end, set up the command
 	 * to queue the remainder of them.
 	 */
 	if (end_that_request_first(req, uptodate, sectors)) {
-		spin_unlock_irqrestore(q->queue_lock, flags);
 		if (!requeue)
 			return SCpnt;
 
@@ -337,7 +335,9 @@
 
 	add_blkdev_randomness(major(req->rq_dev));
 
-	if(blk_rq_tagged(req))
+	spin_lock_irqsave(q->queue_lock, flags);
+
+	if (blk_rq_tagged(req))
 		blk_queue_end_tag(q, req);
 
 	end_that_request_last(req);