7 files changed, 15 insertions, 11 deletions

diff --git a/drivers/block/ub.c b/drivers/block/ub.c
index f32781cff456..e67bbae9547d 100644
--- a/drivers/block/ub.c
+++ b/drivers/block/ub.c
@@ -781,8 +781,10 @@ static void ub_rw_cmd_done(struct ub_dev *sc, struct ub_scsi_cmd *cmd)
 
         if (cmd->error == 0) {
                 if (blk_pc_request(rq)) {
-                        if (cmd->act_len < blk_rq_bytes(rq))
-                                rq->resid_len = blk_rq_bytes(rq) - cmd->act_len;
+                        if (cmd->act_len >= rq->resid_len)
+                                rq->resid_len = 0;
+                        else
+                                rq->resid_len -= cmd->act_len;
                         scsi_status = 0;
                 } else {
                         if (cmd->act_len != cmd->len) {
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 4c7792fd5f93..081aed6781cc 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -699,6 +699,7 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)
 
 out_end:
         if (blk_pc_request(rq) && rc == 0) {
+                rq->resid_len = 0;
                 blk_end_request_all(rq, 0);
                 hwif->rq = NULL;
         } else {
@@ -718,8 +719,7 @@ out_end:
 
                 /* make sure it's fully ended */
                 if (blk_fs_request(rq) == 0) {
-                        rq->resid_len = blk_rq_bytes(rq) -
-                                (cmd->nbytes - cmd->nleft);
+                        rq->resid_len -= cmd->nbytes - cmd->nleft;
                         if (uptodate == 0 && (cmd->tf_flags & IDE_TFLAG_WRITE))
                                 rq->resid_len += cmd->last_xfer_len;
                 }
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index e16604562f28..683ff37d4079 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -380,7 +380,7 @@ static int ide_tape_callback(ide_drive_t *drive, int dsc)
                 }
 
                 tape->first_frame += blocks;
-                rq->resid_len = blk_rq_bytes(rq) - blocks * tape->blk_size;
+                rq->resid_len -= blocks * tape->blk_size;
 
                 if (pc->error) {
                         uptodate = 0;
diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
index 4e6fcf06a6f2..79f5433359f9 100644
--- a/drivers/message/fusion/mptsas.c
+++ b/drivers/message/fusion/mptsas.c
@@ -1357,7 +1357,8 @@ static int mptsas_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
                 smprep = (SmpPassthroughReply_t *)ioc->sas_mgmt.reply;
                 memcpy(req->sense, smprep, sizeof(*smprep));
                 req->sense_len = sizeof(*smprep);
-                rsp->resid_len = blk_rq_bytes(rsp) - smprep->ResponseDataLength;
+                req->resid_len = 0;
+                rsp->resid_len -= smprep->ResponseDataLength;
         } else {
                 printk(MYIOC_s_ERR_FMT "%s: smp passthru reply failed to be returned\n",
                     ioc->name, __func__);
diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c
index 531af9ed7199..54fa1e42dc4d 100644
--- a/drivers/scsi/libsas/sas_expander.c
+++ b/drivers/scsi/libsas/sas_expander.c
@@ -1937,7 +1937,11 @@ int sas_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
         if (ret > 0) {
                 /* positive number is the untransferred residual */
                 rsp->resid_len = ret;
+                req->resid_len = 0;
                 ret = 0;
+        } else if (ret == 0) {
+                rsp->resid_len = 0;
+                req->resid_len = 0;
         }
 
         return ret;
diff --git a/drivers/scsi/libsas/sas_host_smp.c b/drivers/scsi/libsas/sas_host_smp.c
index be9a951b977d..1bc3b7567994 100644
--- a/drivers/scsi/libsas/sas_host_smp.c
+++ b/drivers/scsi/libsas/sas_host_smp.c
@@ -176,9 +176,6 @@ int sas_smp_host_handler(struct Scsi_Host *shost, struct request *req,
         resp_data[1] = req_data[1];
         resp_data[2] = SMP_RESP_FUNC_UNK;
 
-        req->resid_len = blk_rq_bytes(req);
-        rsp->resid_len = blk_rq_bytes(rsp);
-
         switch (req_data[1]) {
         case SMP_REPORT_GENERAL:
                 req->resid_len -= 8;
diff --git a/drivers/scsi/mpt2sas/mpt2sas_transport.c b/drivers/scsi/mpt2sas/mpt2sas_transport.c
index af95a449930e..5c65da519e39 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_transport.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_transport.c
@@ -1170,8 +1170,8 @@ transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
 
                 memcpy(req->sense, mpi_reply, sizeof(*mpi_reply));
                 req->sense_len = sizeof(*mpi_reply);
-                rsp->resid_len = blk_rq_bytes(rsp) -
-                                 mpi_reply->ResponseDataLength;
+                req->resid_len = 0;
+                rsp->resid_len -= mpi_reply->ResponseDataLength;
         } else {
                 dtransportprintk(ioc, printk(MPT2SAS_DEBUG_FMT
                     "%s - no reply\n", ioc->name, __func__));