1 files changed, 6 insertions, 9 deletions

diff --git a/drivers/s390/block/dasd_fba.c b/drivers/s390/block/dasd_fba.c
index da16ead8aff2..119b8d2d5f17 100644
--- a/drivers/s390/block/dasd_fba.c
+++ b/drivers/s390/block/dasd_fba.c
@@ -234,14 +234,13 @@ dasd_fba_build_cp(struct dasd_device * device, struct request *req)
         struct LO_fba_data *LO_data;
         struct dasd_ccw_req *cqr;
         struct ccw1 *ccw;
-        struct bio *bio;
+        struct req_iterator iter;
         struct bio_vec *bv;
         char *dst;
         int count, cidaw, cplength, datasize;
         sector_t recid, first_rec, last_rec;
         unsigned int blksize, off;
         unsigned char cmd;
-        int i;
 
         private = (struct dasd_fba_private *) device->private;
         if (rq_data_dir(req) == READ) {
@@ -257,8 +256,7 @@ dasd_fba_build_cp(struct dasd_device * device, struct request *req)
         /* Check struct bio and count the number of blocks for the request. */
         count = 0;
         cidaw = 0;
-        rq_for_each_bio(bio, req) {
-                bio_for_each_segment(bv, bio, i) {
+        rq_for_each_segment(bv, req, iter) {
                         if (bv->bv_len & (blksize - 1))
                                 /* Fba can only do full blocks. */
                                 return ERR_PTR(-EINVAL);
@@ -268,7 +266,6 @@ dasd_fba_build_cp(struct dasd_device * device, struct request *req)
                                             bv->bv_len))
                                 cidaw += bv->bv_len / blksize;
 #endif
-                }
         }
         /* Paranoia. */
         if (count != last_rec - first_rec + 1)
@@ -304,7 +301,7 @@ dasd_fba_build_cp(struct dasd_device * device, struct request *req)
                 locate_record(ccw++, LO_data++, rq_data_dir(req), 0, count);
         }
         recid = first_rec;
-        rq_for_each_bio(bio, req) bio_for_each_segment(bv, bio, i) {
+        rq_for_each_segment(bv, req, iter) {
                 dst = page_address(bv->bv_page) + bv->bv_offset;
                 if (dasd_page_cache) {
                         char *copy = kmem_cache_alloc(dasd_page_cache,
@@ -359,11 +356,11 @@ dasd_fba_free_cp(struct dasd_ccw_req *cqr, struct request *req)
 {
         struct dasd_fba_private *private;
         struct ccw1 *ccw;
-        struct bio *bio;
+        struct req_iterator iter;
         struct bio_vec *bv;
         char *dst, *cda;
         unsigned int blksize, off;
-        int i, status;
+        int status;
 
         if (!dasd_page_cache)
                 goto out;
@@ -374,7 +371,7 @@ dasd_fba_free_cp(struct dasd_ccw_req *cqr, struct request *req)
         ccw++;
         if (private->rdc_data.mode.bits.data_chain != 0)
                 ccw++;
-        rq_for_each_bio(bio, req) bio_for_each_segment(bv, bio, i) {
+        rq_for_each_segment(bv, req, iter) {
                 dst = page_address(bv->bv_page) + bv->bv_offset;
                 for (off = 0; off < bv->bv_len; off += blksize) {
                         /* Skip locate record. */