Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

block: remove bvec_to_phys 



We only use it in biovec_phys_mergeable and a m68k paravirt driver,
so just opencode it there.  Also remove the pointless unsigned long cast
for the offset in the opencoded instances.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 3dccdae5

arch/m68k/emu/nfblock.c

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ static blk_qc_t nfhd_make_request(struct request_queue *queue, struct bio *bio) 
		len = bvec.bv_len;

		len >>= 9;

		nfhd_read_write(dev->id, 0, dir, sec >> shift, len >> shift,

				bvec_to_phys(&bvec));

				page_to_phys(bvec.bv_page) + bvec.bv_offset);

		sec += len;

	}

	bio_endio(bio);

block/blk.h

+2 −2
Original line number Diff line number Diff line
@@ -157,8 +157,8 @@ static inline bool biovec_phys_mergeable(struct request_queue *q, 
		struct bio_vec *vec1, struct bio_vec *vec2)

{

	unsigned long mask = queue_segment_boundary(q);

	phys_addr_t addr1 = bvec_to_phys(vec1);

	phys_addr_t addr2 = bvec_to_phys(vec2);

	phys_addr_t addr1 = page_to_phys(vec1->bv_page) + vec1->bv_offset;

	phys_addr_t addr2 = page_to_phys(vec2->bv_page) + vec2->bv_offset;



	if (addr1 + vec1->bv_len != addr2)

		return false;

include/linux/bio.h

+0 −5
Original line number Diff line number Diff line
@@ -132,11 +132,6 @@ static inline bool bio_full(struct bio *bio) 
	return bio->bi_vcnt >= bio->bi_max_vecs;

}



/*

 * will die

 */

#define bvec_to_phys(bv)	(page_to_phys((bv)->bv_page) + (unsigned long) (bv)->bv_offset)



/*

 * drivers should _never_ use the all version - the bio may have been split

 * before it got to the driver and the driver won't own all of it