1 files changed, 13 insertions, 13 deletions

diff --git a/drivers/s390/block/dasd_fba.c b/drivers/s390/block/dasd_fba.c
index 9cbc8c32ba59..2c8e68bf9a1c 100644
--- a/drivers/s390/block/dasd_fba.c
+++ b/drivers/s390/block/dasd_fba.c
@@ -260,7 +260,7 @@ static struct dasd_ccw_req *dasd_fba_build_cp(struct dasd_device * memdev,
         struct dasd_ccw_req *cqr;
         struct ccw1 *ccw;
         struct req_iterator iter;
-        struct bio_vec *bv;
+        struct bio_vec bv;
         char *dst;
         int count, cidaw, cplength, datasize;
         sector_t recid, first_rec, last_rec;
@@ -283,13 +283,13 @@ static struct dasd_ccw_req *dasd_fba_build_cp(struct dasd_device * memdev,
         count = 0;
         cidaw = 0;
         rq_for_each_segment(bv, req, iter) {
-                if (bv->bv_len & (blksize - 1))
+                if (bv.bv_len & (blksize - 1))
                         /* Fba can only do full blocks. */
                         return ERR_PTR(-EINVAL);
-                count += bv->bv_len >> (block->s2b_shift + 9);
+                count += bv.bv_len >> (block->s2b_shift + 9);
 #if defined(CONFIG_64BIT)
-                if (idal_is_needed (page_address(bv->bv_page), bv->bv_len))
-                        cidaw += bv->bv_len / blksize;
+                if (idal_is_needed (page_address(bv.bv_page), bv.bv_len))
+                        cidaw += bv.bv_len / blksize;
 #endif
         }
         /* Paranoia. */
@@ -326,16 +326,16 @@ static struct dasd_ccw_req *dasd_fba_build_cp(struct dasd_device * memdev,
         }
         recid = first_rec;
         rq_for_each_segment(bv, req, iter) {
-                dst = page_address(bv->bv_page) + bv->bv_offset;
+                dst = page_address(bv.bv_page) + bv.bv_offset;
                 if (dasd_page_cache) {
                         char *copy = kmem_cache_alloc(dasd_page_cache,
                                                       GFP_DMA | __GFP_NOWARN);
                         if (copy && rq_data_dir(req) == WRITE)
-                                memcpy(copy + bv->bv_offset, dst, bv->bv_len);
+                                memcpy(copy + bv.bv_offset, dst, bv.bv_len);
                         if (copy)
-                                dst = copy + bv->bv_offset;
+                                dst = copy + bv.bv_offset;
                 }
-                for (off = 0; off < bv->bv_len; off += blksize) {
+                for (off = 0; off < bv.bv_len; off += blksize) {
                         /* Locate record for stupid devices. */
                         if (private->rdc_data.mode.bits.data_chain == 0) {
                                 ccw[-1].flags |= CCW_FLAG_CC;
@@ -384,7 +384,7 @@ dasd_fba_free_cp(struct dasd_ccw_req *cqr, struct request *req)
         struct dasd_fba_private *private;
         struct ccw1 *ccw;
         struct req_iterator iter;
-        struct bio_vec *bv;
+        struct bio_vec bv;
         char *dst, *cda;
         unsigned int blksize, off;
         int status;
@@ -399,8 +399,8 @@ dasd_fba_free_cp(struct dasd_ccw_req *cqr, struct request *req)
         if (private->rdc_data.mode.bits.data_chain != 0)
                 ccw++;
         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) {
+                dst = page_address(bv.bv_page) + bv.bv_offset;
+                for (off = 0; off < bv.bv_len; off += blksize) {
                         /* Skip locate record. */
                         if (private->rdc_data.mode.bits.data_chain == 0)
                                 ccw++;
@@ -411,7 +411,7 @@ dasd_fba_free_cp(struct dasd_ccw_req *cqr, struct request *req)
                                         cda = (char *)((addr_t) ccw->cda);
                                 if (dst != cda) {
                                         if (rq_data_dir(req) == READ)
-                                                memcpy(dst, cda, bv->bv_len);
+                                                memcpy(dst, cda, bv.bv_len);
                                         kmem_cache_free(dasd_page_cache,
                                             (void *)((addr_t)cda & PAGE_MASK));
                                 }