Commit f619d254 authored by Kent Overstreet's avatar Kent Overstreet
Browse files

block: Kill bio_iovec_idx(), __bio_iovec() 



bio_iovec_idx() and __bio_iovec() don't have any valid uses anymore -
previous users have been converted to bio_iovec_iter() or other methods.

__BVEC_END() has to go too - the bvec array can't be used directly for
the last biovec because we might only be using the first portion of it,
we have to iterate over the bvec array with bio_for_each_segment() which
checks against the current value of bi_iter.bi_size.

Signed-off-by: default avatarKent Overstreet <kmo@daterainc.com>
Cc: Jens Axboe <axboe@kernel.dk>
parent f38a5181

block/blk-merge.c

+11 −2
Original line number Diff line number Diff line
@@ -86,6 +86,9 @@ EXPORT_SYMBOL(blk_recount_segments); 
static int blk_phys_contig_segment(struct request_queue *q, struct bio *bio,

				   struct bio *nxt)

{

	struct bio_vec end_bv, nxt_bv;

	struct bvec_iter iter;



	if (!blk_queue_cluster(q))

		return 0;
@@ -96,14 +99,20 @@ static int blk_phys_contig_segment(struct request_queue *q, struct bio *bio, 
	if (!bio_has_data(bio))

		return 1;



	if (!BIOVEC_PHYS_MERGEABLE(__BVEC_END(bio), __BVEC_START(nxt)))

	bio_for_each_segment(end_bv, bio, iter)

		if (end_bv.bv_len == iter.bi_size)

			break;



	nxt_bv = bio_iovec(nxt);



	if (!BIOVEC_PHYS_MERGEABLE(&end_bv, &nxt_bv))

		return 0;



	/*

	 * bio and nxt are contiguous in memory; check if the queue allows

	 * these two to be merged into one

	 */

	if (BIO_SEG_BOUNDARY(q, bio, nxt))

	if (BIOVEC_SEG_BOUNDARY(q, &end_bv, &nxt_bv))

		return 1;



	return 0;

include/linux/bio.h

+8 −18
Original line number Diff line number Diff line
@@ -61,9 +61,6 @@ 
 * various member access, note that bio_data should of course not be used

 * on highmem page vectors

 */

#define bio_iovec_idx(bio, idx)	(&((bio)->bi_io_vec[(idx)]))

#define __bio_iovec(bio)	bio_iovec_idx((bio), (bio)->bi_iter.bi_idx)



#define __bvec_iter_bvec(bvec, iter)	(&(bvec)[(iter).bi_idx])



#define bvec_iter_page(bvec, iter)				\
@@ -162,9 +159,9 @@ static inline void *bio_data(struct bio *bio) 
 * permanent PIO fall back, user is probably better off disabling highmem

 * I/O completely on that queue (see ide-dma for example)

 */

#define __bio_kmap_atomic(bio, idx)				\

	(kmap_atomic(bio_iovec_idx((bio), (idx))->bv_page) +	\

		bio_iovec_idx((bio), (idx))->bv_offset)

#define __bio_kmap_atomic(bio, iter)				\

	(kmap_atomic(bio_iter_iovec((bio), (iter)).bv_page) +	\

		bio_iter_iovec((bio), (iter)).bv_offset)



#define __bio_kunmap_atomic(addr)	kunmap_atomic(addr)
@@ -172,9 +169,6 @@ static inline void *bio_data(struct bio *bio) 
 * merge helpers etc

 */



#define __BVEC_END(bio)		bio_iovec_idx((bio), (bio)->bi_vcnt - 1)

#define __BVEC_START(bio)	bio_iovec_idx((bio), (bio)->bi_iter.bi_idx)



/* Default implementation of BIOVEC_PHYS_MERGEABLE */

#define __BIOVEC_PHYS_MERGEABLE(vec1, vec2)	\

	((bvec_to_phys((vec1)) + (vec1)->bv_len) == bvec_to_phys((vec2)))
@@ -191,8 +185,6 @@ static inline void *bio_data(struct bio *bio) 
	(((addr1) | (mask)) == (((addr2) - 1) | (mask)))

#define BIOVEC_SEG_BOUNDARY(q, b1, b2) \

	__BIO_SEG_BOUNDARY(bvec_to_phys((b1)), bvec_to_phys((b2)) + (b2)->bv_len, queue_segment_boundary((q)))

#define BIO_SEG_BOUNDARY(q, b1, b2) \

	BIOVEC_SEG_BOUNDARY((q), __BVEC_END((b1)), __BVEC_START((b2)))



#define bio_io_error(bio) bio_endio((bio), -EIO)
@@ -201,9 +193,7 @@ static inline void *bio_data(struct bio *bio) 
 * before it got to the driver and the driver won't own all of it

 */

#define bio_for_each_segment_all(bvl, bio, i)				\

	for (i = 0;							\

	     bvl = bio_iovec_idx((bio), (i)), i < (bio)->bi_vcnt;	\

	     i++)

	for (i = 0, bvl = (bio)->bi_io_vec; i < (bio)->bi_vcnt; i++, bvl++)



static inline void bvec_iter_advance(struct bio_vec *bv, struct bvec_iter *iter,

				     unsigned bytes)
@@ -468,15 +458,15 @@ static inline void bvec_kunmap_irq(char *buffer, unsigned long *flags) 
}

#endif



static inline char *__bio_kmap_irq(struct bio *bio, unsigned short idx,

static inline char *__bio_kmap_irq(struct bio *bio, struct bvec_iter iter,

				   unsigned long *flags)

{

	return bvec_kmap_irq(bio_iovec_idx(bio, idx), flags);

	return bvec_kmap_irq(&bio_iter_iovec(bio, iter), flags);

}

#define __bio_kunmap_irq(buf, flags)	bvec_kunmap_irq(buf, flags)



#define bio_kmap_irq(bio, flags) \

	__bio_kmap_irq((bio), (bio)->bi_iter.bi_idx, (flags))

	__bio_kmap_irq((bio), (bio)->bi_iter, (flags))

#define bio_kunmap_irq(buf,flags)	__bio_kunmap_irq(buf, flags)



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE