Commit bf5fb875 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

dasd: use bvec_virt 



Use bvec_virt instead of open coding it.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarStefan Haberland <sth@linux.ibm.com>
Link: https://lore.kernel.org/r/20210804095634.460779-14-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 6da525b3

drivers/s390/block/dasd_diag.c

+1 −1
Original line number Diff line number Diff line
@@ -552,7 +552,7 @@ 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;

		dst = bvec_virt(&bv);

		for (off = 0; off < bv.bv_len; off += blksize) {

			memset(dbio, 0, sizeof (struct dasd_diag_bio));

			dbio->type = rw_cmd;

drivers/s390/block/dasd_eckd.c

+7 −7
Original line number Diff line number Diff line
@@ -3267,7 +3267,7 @@ static int dasd_eckd_ese_read(struct dasd_ccw_req *cqr, struct irb *irb) 
	end_blk = (curr_trk + 1) * recs_per_trk;



	rq_for_each_segment(bv, req, iter) {

		dst = page_address(bv.bv_page) + bv.bv_offset;

		dst = bvec_virt(&bv);

		for (off = 0; off < bv.bv_len; off += blksize) {

			if (first_blk + blk_count >= end_blk) {

				cqr->proc_bytes = blk_count * blksize;
@@ -3999,7 +3999,7 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_cmd_single( 
			      last_rec - recid + 1, cmd, basedev, blksize);

	}

	rq_for_each_segment(bv, req, iter) {

		dst = page_address(bv.bv_page) + bv.bv_offset;

		dst = bvec_virt(&bv);

		if (dasd_page_cache) {

			char *copy = kmem_cache_alloc(dasd_page_cache,

						      GFP_DMA | __GFP_NOWARN);
@@ -4166,7 +4166,7 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_cmd_track( 
	idaw_dst = NULL;

	idaw_len = 0;

	rq_for_each_segment(bv, req, iter) {

		dst = page_address(bv.bv_page) + bv.bv_offset;

		dst = bvec_virt(&bv);

		seg_len = bv.bv_len;

		while (seg_len) {

			if (new_track) {
@@ -4509,7 +4509,7 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_tpm_track( 
		new_track = 1;

		recid = first_rec;

		rq_for_each_segment(bv, req, iter) {

			dst = page_address(bv.bv_page) + bv.bv_offset;

			dst = bvec_virt(&bv);

			seg_len = bv.bv_len;

			while (seg_len) {

				if (new_track) {
@@ -4542,7 +4542,7 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_tpm_track( 
		}

	} else {

		rq_for_each_segment(bv, req, iter) {

			dst = page_address(bv.bv_page) + bv.bv_offset;

			dst = bvec_virt(&bv);

			last_tidaw = itcw_add_tidaw(itcw, 0x00,

						    dst, bv.bv_len);

			if (IS_ERR(last_tidaw)) {
@@ -4778,7 +4778,7 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_raw(struct dasd_device *startdev, 
			idaws = idal_create_words(idaws, rawpadpage, PAGE_SIZE);

	}

	rq_for_each_segment(bv, req, iter) {

		dst = page_address(bv.bv_page) + bv.bv_offset;

		dst = bvec_virt(&bv);

		seg_len = bv.bv_len;

		if (cmd == DASD_ECKD_CCW_READ_TRACK)

			memset(dst, 0, seg_len);
@@ -4839,7 +4839,7 @@ dasd_eckd_free_cp(struct dasd_ccw_req *cqr, struct request *req) 
	if (private->uses_cdl == 0 || recid > 2*blk_per_trk)

		ccw++;

	rq_for_each_segment(bv, req, iter) {

		dst = page_address(bv.bv_page) + bv.bv_offset;

		dst = bvec_virt(&bv);

		for (off = 0; off < bv.bv_len; off += blksize) {

			/* Skip locate record. */

			if (private->uses_cdl && recid <= 2*blk_per_trk)

drivers/s390/block/dasd_fba.c

+2 −2
Original line number Diff line number Diff line
@@ -501,7 +501,7 @@ static struct dasd_ccw_req *dasd_fba_build_cp_regular( 
	}

	recid = first_rec;

	rq_for_each_segment(bv, req, iter) {

		dst = page_address(bv.bv_page) + bv.bv_offset;

		dst = bvec_virt(&bv);

		if (dasd_page_cache) {

			char *copy = kmem_cache_alloc(dasd_page_cache,

						      GFP_DMA | __GFP_NOWARN);
@@ -583,7 +583,7 @@ 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;

		dst = bvec_virt(&bv);

		for (off = 0; off < bv.bv_len; off += blksize) {

			/* Skip locate record. */

			if (private->rdc_data.mode.bits.data_chain == 0)