Looks good.
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@xxxxxxx>
On 05/12/2019 11:39 PM, Christoph Hellwig wrote:
> This function just has a few trivial assignments, has two callers with
> one of them being in the fastpath.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
> ---
> block/blk-core.c | 11 -----------
> block/blk.h | 13 ++++++++++++-
> 2 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/block/blk-core.c b/block/blk-core.c
> index c894c9887dca..9405388ac658 100644
> --- a/block/blk-core.c
> +++ b/block/blk-core.c
> @@ -1473,17 +1473,6 @@ bool blk_update_request(struct request *req, blk_status_t error,
> }
> EXPORT_SYMBOL_GPL(blk_update_request);
>
> -void blk_rq_bio_prep(struct request *rq, struct bio *bio, unsigned int nr_segs)
> -{
> - rq->nr_phys_segments = nr_segs;
> - rq->__data_len = bio->bi_iter.bi_size;
> - rq->bio = rq->biotail = bio;
> - rq->ioprio = bio_prio(bio);
> -
> - if (bio->bi_disk)
> - rq->rq_disk = bio->bi_disk;
> -}
> -
> #if ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE
> /**
> * rq_flush_dcache_pages - Helper function to flush all pages in a request
> diff --git a/block/blk.h b/block/blk.h
> index 5352cdb876a6..cbb0995ed17e 100644
> --- a/block/blk.h
> +++ b/block/blk.h
> @@ -51,7 +51,6 @@ struct blk_flush_queue *blk_alloc_flush_queue(struct request_queue *q,
> void blk_free_flush_queue(struct blk_flush_queue *q);
>
> void blk_exit_queue(struct request_queue *q);
> -void blk_rq_bio_prep(struct request *rq, struct bio *bio, unsigned int nr_segs);
> void blk_freeze_queue(struct request_queue *q);
>
> static inline void blk_queue_enter_live(struct request_queue *q)
> @@ -100,6 +99,18 @@ static inline bool bvec_gap_to_prev(struct request_queue *q,
> return __bvec_gap_to_prev(q, bprv, offset);
> }
>
> +static inline void blk_rq_bio_prep(struct request *rq, struct bio *bio,
> + unsigned int nr_segs)
> +{
> + rq->nr_phys_segments = nr_segs;
> + rq->__data_len = bio->bi_iter.bi_size;
> + rq->bio = rq->biotail = bio;
> + rq->ioprio = bio_prio(bio);
> +
> + if (bio->bi_disk)
> + rq->rq_disk = bio->bi_disk;
> +}
> +
> #ifdef CONFIG_BLK_DEV_INTEGRITY
> void blk_flush_integrity(void);
> bool __bio_integrity_endio(struct bio *);
>
