Commit b95be99d authored by Alan Stern's avatar Alan Stern Committed by James Bottomley

[SCSI] fix oops in scsi_release_buffers()

I found one other thing that needs to be fixed.  The call to
scsi_release_buffers in scsi_unprep_request causes an oops, because the
sgtable has already been freed in scsi_io_completion.  The following patch
is needed.
Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 1832a586
...@@ -118,7 +118,6 @@ static void scsi_unprep_request(struct request *req) ...@@ -118,7 +118,6 @@ static void scsi_unprep_request(struct request *req)
req->flags &= ~REQ_DONTPREP; req->flags &= ~REQ_DONTPREP;
req->special = (req->flags & REQ_SPECIAL) ? cmd->sc_request : NULL; req->special = (req->flags & REQ_SPECIAL) ? cmd->sc_request : NULL;
scsi_release_buffers(cmd);
scsi_put_command(cmd); scsi_put_command(cmd);
} }
...@@ -1512,7 +1511,6 @@ static void scsi_request_fn(struct request_queue *q) ...@@ -1512,7 +1511,6 @@ static void scsi_request_fn(struct request_queue *q)
* cases (host limits or settings) should run the queue at some * cases (host limits or settings) should run the queue at some
* later time. * later time.
*/ */
scsi_unprep_request(req);
spin_lock_irq(q->queue_lock); spin_lock_irq(q->queue_lock);
blk_requeue_request(q, req); blk_requeue_request(q, req);
sdev->device_busy--; sdev->device_busy--;
......
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