Commit 08435553 authored by Jens Axboe's avatar Jens Axboe

[PATCH] scsi doesn't need locking around end_that_request_first()

Seems James introduced this one, it's not needed though. Will take a
look at eh thread now...
parent 5937c67e
...@@ -317,13 +317,11 @@ static Scsi_Cmnd *__scsi_end_request(Scsi_Cmnd * SCpnt, ...@@ -317,13 +317,11 @@ static Scsi_Cmnd *__scsi_end_request(Scsi_Cmnd * SCpnt,
ASSERT_LOCK(q->queue_lock, 0); 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 * If there are blocks left over at the end, set up the command
* to queue the remainder of them. * to queue the remainder of them.
*/ */
if (end_that_request_first(req, uptodate, sectors)) { if (end_that_request_first(req, uptodate, sectors)) {
spin_unlock_irqrestore(q->queue_lock, flags);
if (!requeue) if (!requeue)
return SCpnt; return SCpnt;
...@@ -337,7 +335,9 @@ static Scsi_Cmnd *__scsi_end_request(Scsi_Cmnd * SCpnt, ...@@ -337,7 +335,9 @@ static Scsi_Cmnd *__scsi_end_request(Scsi_Cmnd * SCpnt,
add_blkdev_randomness(major(req->rq_dev)); 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); blk_queue_end_tag(q, req);
end_that_request_last(req); end_that_request_last(req);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment