1 files changed, 16 insertions, 15 deletions

diff --git a/drivers/scsi/mpt2sas/mpt2sas_transport.c b/drivers/scsi/mpt2sas/mpt2sas_transport.c
index 9d26637308be..7143e86af326 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_transport.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_transport.c
@@ -1901,7 +1901,7 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
         struct MPT2SAS_ADAPTER *ioc = shost_priv(shost);
         Mpi2SmpPassthroughRequest_t *mpi_request;
         Mpi2SmpPassthroughReply_t *mpi_reply;
-        int rc, i;
+        int rc;
         u16 smid;
         u32 ioc_state;
         unsigned long timeleft;
@@ -1916,7 +1916,8 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
         void *pci_addr_out = NULL;
         u16 wait_state_count;
         struct request *rsp = req->next_rq;
-        struct bio_vec *bvec = NULL;
+        struct bio_vec bvec;
+        struct bvec_iter iter;
 
         if (!rsp) {
                 printk(MPT2SAS_ERR_FMT "%s: the smp response space is "
@@ -1955,11 +1956,11 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
                         goto out;
                 }
 
-                bio_for_each_segment(bvec, req->bio, i) {
+                bio_for_each_segment(bvec, req->bio, iter) {
                         memcpy(pci_addr_out + offset,
-                            page_address(bvec->bv_page) + bvec->bv_offset,
-                            bvec->bv_len);
-                        offset += bvec->bv_len;
+                            page_address(bvec.bv_page) + bvec.bv_offset,
+                            bvec.bv_len);
+                        offset += bvec.bv_len;
                 }
         } else {
                 dma_addr_out = pci_map_single(ioc->pdev, bio_data(req->bio),
@@ -2106,19 +2107,19 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
                         u32 offset = 0;
                         u32 bytes_to_copy =
                             le16_to_cpu(mpi_reply->ResponseDataLength);
-                        bio_for_each_segment(bvec, rsp->bio, i) {
-                                if (bytes_to_copy <= bvec->bv_len) {
-                                        memcpy(page_address(bvec->bv_page) +
-                                            bvec->bv_offset, pci_addr_in +
+                        bio_for_each_segment(bvec, rsp->bio, iter) {
+                                if (bytes_to_copy <= bvec.bv_len) {
+                                        memcpy(page_address(bvec.bv_page) +
+                                            bvec.bv_offset, pci_addr_in +
                                             offset, bytes_to_copy);
                                         break;
                                 } else {
-                                        memcpy(page_address(bvec->bv_page) +
-                                            bvec->bv_offset, pci_addr_in +
-                                            offset, bvec->bv_len);
-                                        bytes_to_copy -= bvec->bv_len;
+                                        memcpy(page_address(bvec.bv_page) +
+                                            bvec.bv_offset, pci_addr_in +
+                                            offset, bvec.bv_len);
+                                        bytes_to_copy -= bvec.bv_len;
                                 }
-                                offset += bvec->bv_len;
+                                offset += bvec.bv_len;
                         }
                 }
         } else {