diff options
author | Mike Christie <michaelc@cs.wisc.edu> | 2005-11-11 06:31:40 -0500 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.(none)> | 2005-12-14 22:08:16 -0500 |
commit | 0d95716d6a1308c465d8c17ed1a217628936bb0c (patch) | |
tree | bf304209ec749fee1b7c66e000874bca973d2ec9 /drivers/scsi/st.c | |
parent | 17e01f216b611fc46956dcd9063aec4de75991e3 (diff) |
[SCSI] complete the whole command when it is REQ_BLOCK_PC
sd does not allow scsi_io_completion to retry commands for
SG_IO requests, and it make sense that it should not happen for st
SG_IO commands too. If for st we hit the bottom of scsi_io_completion
we will probably screw things up pretty bad. This patch returns to the
block layer that the whole command completed and relies on the caller to check
the request errors field. For initialization commands like in sd, this adds
the previous behavior where scsi_io_completion did not process the error.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/st.c')
-rw-r--r-- | drivers/scsi/st.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c index 6d9078705c5..053444b027d 100644 --- a/drivers/scsi/st.c +++ b/drivers/scsi/st.c | |||
@@ -4185,7 +4185,11 @@ static void scsi_tape_release(struct kref *kref) | |||
4185 | 4185 | ||
4186 | static void st_intr(struct scsi_cmnd *SCpnt) | 4186 | static void st_intr(struct scsi_cmnd *SCpnt) |
4187 | { | 4187 | { |
4188 | scsi_io_completion(SCpnt, (SCpnt->result ? 0: SCpnt->bufflen), 1); | 4188 | /* |
4189 | * The caller should be checking the request's errors | ||
4190 | * value. | ||
4191 | */ | ||
4192 | scsi_io_completion(SCpnt, SCpnt->bufflen, 0); | ||
4189 | } | 4193 | } |
4190 | 4194 | ||
4191 | /* | 4195 | /* |