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

block: move req_gap_back_merge to blk.h 



No need to expose these helpers outside the block layer.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent e9907009

block/blk.h

+19 −0
Original line number Diff line number Diff line
@@ -149,6 +149,25 @@ static inline void blk_queue_enter_live(struct request_queue *q) 
	percpu_ref_get(&q->q_usage_counter);

}



static inline bool __bvec_gap_to_prev(struct request_queue *q,

		struct bio_vec *bprv, unsigned int offset)

{

	return offset ||

		((bprv->bv_offset + bprv->bv_len) & queue_virt_boundary(q));

}



/*

 * Check if adding a bio_vec after bprv with offset would create a gap in

 * the SG list. Most drivers don't care about this, but some do.

 */

static inline bool bvec_gap_to_prev(struct request_queue *q,

		struct bio_vec *bprv, unsigned int offset)

{

	if (!queue_virt_boundary(q))

		return false;

	return __bvec_gap_to_prev(q, bprv, offset);

}



#ifdef CONFIG_BLK_DEV_INTEGRITY

void blk_flush_integrity(void);

bool __bio_integrity_endio(struct bio *);

include/linux/blkdev.h

+0 −19
Original line number Diff line number Diff line
@@ -1676,25 +1676,6 @@ static inline void put_dev_sector(Sector p) 
	put_page(p.v);

}



static inline bool __bvec_gap_to_prev(struct request_queue *q,

				struct bio_vec *bprv, unsigned int offset)

{

	return offset ||

		((bprv->bv_offset + bprv->bv_len) & queue_virt_boundary(q));

}



/*

 * Check if adding a bio_vec after bprv with offset would create a gap in

 * the SG list. Most drivers don't care about this, but some do.

 */

static inline bool bvec_gap_to_prev(struct request_queue *q,

				struct bio_vec *bprv, unsigned int offset)

{

	if (!queue_virt_boundary(q))

		return false;

	return __bvec_gap_to_prev(q, bprv, offset);

}



int kblockd_schedule_work(struct work_struct *work);

int kblockd_schedule_work_on(int cpu, struct work_struct *work);

int kblockd_mod_delayed_work_on(int cpu, struct delayed_work *dwork, unsigned long delay);