block: Convert bio_for_each_segment() to bvec_iter

More prep work for immutable biovecs - with immutable bvecs drivers
won't be able to use the biovec directly, they'll need to use helpers
that take into account bio->bi_iter.bi_bvec_done.

This updates callers for the new usage without changing the
implementation yet.

Signed-off-by: Kent Overstreet <kmo@daterainc.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: "Ed L. Cashin" <ecashin@coraid.com>
Cc: Nick Piggin <npiggin@kernel.dk>
Cc: Lars Ellenberg <drbd-dev@lists.linbit.com>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Paul Clements <Paul.Clements@steeleye.com>
Cc: Jim Paris <jim@jtan.com>
Cc: Geoff Levand <geoff@infradead.org>
Cc: Yehuda Sadeh <yehuda@inktank.com>
Cc: Sage Weil <sage@inktank.com>
Cc: Alex Elder <elder@inktank.com>
Cc: ceph-devel@vger.kernel.org
Cc: Joshua Morris <josh.h.morris@us.ibm.com>
Cc: Philip Kelleher <pjk1939@linux.vnet.ibm.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: Neil Brown <neilb@suse.de>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: linux390@de.ibm.com
Cc: Nagalakshmi Nandigama <Nagalakshmi.Nandigama@lsi.com>
Cc: Sreekanth Reddy <Sreekanth.Reddy@lsi.com>
Cc: support@lsi.com
Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Steven Whitehouse <swhiteho@redhat.com>
Cc: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Guo Chao <yan@linux.vnet.ibm.com>
Cc: Asai Thambi S P <asamymuthupa@micron.com>
Cc: Selvan Mani <smani@micron.com>
Cc: Sam Bradshaw <sbradshaw@micron.com>
Cc: Matthew Wilcox <matthew.r.wilcox@intel.com>
Cc: Keith Busch <keith.busch@intel.com>
Cc: Stephen Hemminger <shemminger@vyatta.com>
Cc: Quoc-Son Anh <quoc-sonx.anh@intel.com>
Cc: Sebastian Ott <sebott@linux.vnet.ibm.com>
Cc: Nitin Gupta <ngupta@vflare.org>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Jerome Marchand <jmarchan@redhat.com>
Cc: Seth Jennings <sjenning@linux.vnet.ibm.com>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: Mike Snitzer <snitzer@redhat.com>
Cc: Vivek Goyal <vgoyal@redhat.com>
Cc: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: Chris Metcalf <cmetcalf@tilera.com>
Cc: Jan Kara <jack@suse.cz>
Cc: linux-m68k@lists.linux-m68k.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: drbd-user@lists.linbit.com
Cc: nbd-general@lists.sourceforge.net
Cc: cbe-oss-dev@lists.ozlabs.org
Cc: xen-devel@lists.xensource.com
Cc: virtualization@lists.linux-foundation.org
Cc: linux-raid@vger.kernel.org
Cc: linux-s390@vger.kernel.org
Cc: DL-MPTFusionLinux@lsi.com
Cc: linux-scsi@vger.kernel.org
Cc: devel@driverdev.osuosl.org
Cc: linux-fsdevel@vger.kernel.org
Cc: cluster-devel@redhat.com
Cc: linux-mm@kvack.org
Acked-by: Geoff Levand <geoff@infradead.org>

2 files changed, 32 insertions, 30 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 {
diff --git a/drivers/scsi/mpt3sas/mpt3sas_transport.c b/drivers/scsi/mpt3sas/mpt3sas_transport.c
index e771a88c6a74..196a67f2e95f 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_transport.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_transport.c
@@ -1884,7 +1884,7 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
         struct MPT3SAS_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;
@@ -1898,7 +1898,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) {
                 pr_err(MPT3SAS_FMT "%s: the smp response space is missing\n",
@@ -1938,11 +1939,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),
@@ -2067,19 +2068,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 {