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

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

block: move integrity_req_gap_{back,front}_merge to blk.h 



No need to expose these to drivers.

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

block/blk.h

+33 −2
Original line number Diff line number Diff line
@@ -158,7 +158,38 @@ static inline bool bio_integrity_endio(struct bio *bio) 
		return __bio_integrity_endio(bio);

	return true;

}

#else



static inline bool integrity_req_gap_back_merge(struct request *req,

		struct bio *next)

{

	struct bio_integrity_payload *bip = bio_integrity(req->bio);

	struct bio_integrity_payload *bip_next = bio_integrity(next);



	return bvec_gap_to_prev(req->q, &bip->bip_vec[bip->bip_vcnt - 1],

				bip_next->bip_vec[0].bv_offset);

}



static inline bool integrity_req_gap_front_merge(struct request *req,

		struct bio *bio)

{

	struct bio_integrity_payload *bip = bio_integrity(bio);

	struct bio_integrity_payload *bip_next = bio_integrity(req->bio);



	return bvec_gap_to_prev(req->q, &bip->bip_vec[bip->bip_vcnt - 1],

				bip_next->bip_vec[0].bv_offset);

}

#else /* CONFIG_BLK_DEV_INTEGRITY */

static inline bool integrity_req_gap_back_merge(struct request *req,

		struct bio *next)

{

	return false;

}

static inline bool integrity_req_gap_front_merge(struct request *req,

		struct bio *bio)

{

	return false;

}



static inline void blk_flush_integrity(void)

{

}
@@ -166,7 +197,7 @@ static inline bool bio_integrity_endio(struct bio *bio) 
{

	return true;

}

#endif

#endif /* CONFIG_BLK_DEV_INTEGRITY */



void blk_timeout_work(struct work_struct *work);

unsigned long blk_rq_timeout(unsigned long timeout);

include/linux/blkdev.h

+0 −31
Original line number Diff line number Diff line
@@ -1843,26 +1843,6 @@ queue_max_integrity_segments(struct request_queue *q) 
	return q->limits.max_integrity_segments;

}



static inline bool integrity_req_gap_back_merge(struct request *req,

						struct bio *next)

{

	struct bio_integrity_payload *bip = bio_integrity(req->bio);

	struct bio_integrity_payload *bip_next = bio_integrity(next);



	return bvec_gap_to_prev(req->q, &bip->bip_vec[bip->bip_vcnt - 1],

				bip_next->bip_vec[0].bv_offset);

}



static inline bool integrity_req_gap_front_merge(struct request *req,

						 struct bio *bio)

{

	struct bio_integrity_payload *bip = bio_integrity(bio);

	struct bio_integrity_payload *bip_next = bio_integrity(req->bio);



	return bvec_gap_to_prev(req->q, &bip->bip_vec[bip->bip_vcnt - 1],

				bip_next->bip_vec[0].bv_offset);

}



/**

 * bio_integrity_intervals - Return number of integrity intervals for a bio

 * @bi:		blk_integrity profile for device
@@ -1947,17 +1927,6 @@ static inline bool blk_integrity_merge_bio(struct request_queue *rq, 
	return true;

}



static inline bool integrity_req_gap_back_merge(struct request *req,

						struct bio *next)

{

	return false;

}

static inline bool integrity_req_gap_front_merge(struct request *req,

						 struct bio *bio)

{

	return false;

}



static inline unsigned int bio_integrity_intervals(struct blk_integrity *bi,

						   unsigned int sectors)

{