block/s390: Fixes for "Convert bio_for_each_segment() to bvec_iter"
Subsystems (3)
PATCH 1/1 block/s390: Fixes for "Convert bio_for_each_segment() to bvec_iter"
5d1f127c3e0c57d64ce75ee04a0db2b40a3e21df was incomplete - this just converts s390's drivers.
Signed-off-by Kent Overstreet <[email protected]>
---
I was poking around a bit, and it looks like there's nothing really preventing these drivers from building on non s390 except that a bunch of headers are in arch/s390/include. Would be nice to get that fixed so we can get better build coverage.
drivers/s390/block/dasd_diag.c | 10 ++++---- drivers/s390/block/dasd_eckd.c | 48 ++++++++++++++++++------------------ drivers/s390/block/dasd_fba.c | 26 +++++++++---------- drivers/s390/block/scm_blk.c | 8 +++--- drivers/s390/block/scm_blk_cluster.c | 4 +-- 5 files changed, 48 insertions(+), 48 deletions(-)
drivers/s390/block/dasd_diag.c +5 -5
@@ -504,7 +504,7 @@ static struct dasd_ccw_req *dasd_diag_build_cp(struct dasd_device *memdev,struct dasd_diag_req *dreq;struct dasd_diag_bio *dbio;struct req_iterator iter; -struct bio_vec *bv; +struct bio_vec bv;char *dst;unsigned int count, datasize;sector_t recid, first_rec, last_rec;
@@ -525,10 +525,10 @@ static struct dasd_ccw_req *dasd_diag_build_cp(struct dasd_device *memdev,/* Check struct bio and count the number of blocks for the request. */ count =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 ); }/* Paranoia. */ if (count != last_rec - first_rec +1 )
@@ -545,8 +545,8 @@ static struct dasd_ccw_req *dasd_diag_build_cp(struct dasd_device *memdev, dbio = dreq->bio; recid = first_rec;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) {memset (dbio,0 ,sizeof (struct dasd_diag_bio )); dbio->type = rw_cmd; dbio->block_number = recid +1 ;
drivers/s390/block/dasd_eckd.c +24 -24
136 lines not on this page · raw message
drivers/s390/block/dasd_fba.c +13 -13
@@ -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 )); }
drivers/s390/block/scm_blk.c +4 -4
@@ -146,7 +146,7 @@ static void scm_request_prepare(struct scm_request *scmrq)struct aidaw *aidaw = scmrq->aidaw;struct msb *msb = &scmrq->aob->msb[0 ];struct req_iterator iter; -struct bio_vec *bv; +struct bio_vec bv; msb->bs =MSB_BS_4K ; scmrq->aob->request.msb_count =1 ;
@@ -158,9 +158,9 @@ static void scm_request_prepare(struct scm_request *scmrq) msb->data_addr = (u64 ) aidaw;rq_for_each_segment (bv, scmrq->request, iter) { -WARN_ON (bv->bv_offset); - msb->blk_count += bv->bv_len >>12 ; - aidaw->data_addr = (u64 )page_address (bv->bv_page); +WARN_ON (bv.bv_offset); + msb->blk_count += bv.bv_len >>12 ; + aidaw->data_addr = (u64 )page_address (bv.bv_page); aidaw++; } }
drivers/s390/block/scm_blk_cluster.c +2 -2
@@ -122,7 +122,7 @@ static void scm_prepare_cluster_request(struct scm_request *scmrq)struct aidaw *aidaw = scmrq->aidaw;struct msb *msb = &scmrq->aob->msb[0 ];struct req_iterator iter; -struct bio_vec *bv; +struct bio_vec bv;int i =0 ;u64 addr;
@@ -163,7 +163,7 @@ static void scm_prepare_cluster_request(struct scm_request *scmrq) i++; }rq_for_each_segment (bv, req, iter) { - aidaw->data_addr = (u64 )page_address (bv->bv_page); + aidaw->data_addr = (u64 )page_address (bv.bv_page); aidaw++; i++; }
Signature · 1 line
1.8.4.2
Jens Axboe
AppliedQuoted 2 lines · Kent Overstreet
5d1f127c3e0c57d64ce75ee04a0db2b40a3e21dfwas incomplete - this just converts s390's drivers.
Applied, but you missed a piece in dcssblk that I updated as well.
Signature · 1 line
Jens Axboe