2 files changed, 12 insertions, 2 deletions

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 365843a1561f..3e136bfe4219 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1247,7 +1247,13 @@ static int scsi_issue_flush_fn(request_queue_t *q, struct gendisk *disk,
 static void scsi_generic_done(struct scsi_cmnd *cmd)
 {
         BUG_ON(!blk_pc_request(cmd->request));
-        scsi_io_completion(cmd, cmd->result == 0 ? cmd->bufflen : 0, 0);
+        /*
+         * This will complete the whole command with uptodate=1 so
+         * as far as the block layer is concerned the command completed
+         * successfully. Since this is a REQ_BLOCK_PC command the
+         * caller should check the request's errors value
+         */
+        scsi_io_completion(cmd, cmd->bufflen, 0);
 }
 
 static int scsi_prep_fn(struct request_queue *q, struct request *req)
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index 6d9078705c5b..053444b027d4 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -4185,7 +4185,11 @@ static void scsi_tape_release(struct kref *kref)
 
 static void st_intr(struct scsi_cmnd *SCpnt)
 {
-        scsi_io_completion(SCpnt, (SCpnt->result ? 0: SCpnt->bufflen), 1);
+        /*
+         * The caller should be checking the request's errors
+         * value.
+         */
+        scsi_io_completion(SCpnt, SCpnt->bufflen, 0);
 }
 
 /*