nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

block: remove blk_rq_bio_prep

Browse source 
There is not real point in a helper just to assign three values to four
fields, especially when the surrounding code is working on the
neighbor fields directly.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Link: https://lore.kernel.org/r/20250103073417.459715-3-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2025-01-03 08:33:58 +01:00 committed by Jens Axboe
parent 6aeb4f8364
commit 02ee5d69e3
3 changed files with 9 additions and 13 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

10
block/blk-map.c
View file

@ -490,17 +490,19 @@ int blk_rq_append_bio(struct request *rq, struct bio *bio)
return ret; return ret;
} }
if (!rq->bio) { if (rq->bio) {
blk_rq_bio_prep(rq, bio, nr_segs);
} else {
if (!ll_back_merge_fn(rq, bio, nr_segs)) if (!ll_back_merge_fn(rq, bio, nr_segs))
return -EINVAL; return -EINVAL;
rq->biotail->bi_next = bio; rq->biotail->bi_next = bio;
rq->biotail = bio; rq->biotail = bio;
rq->__data_len += (bio)->bi_iter.bi_size; rq->__data_len += bio->bi_iter.bi_size;
bio_crypt_free_ctx(bio); bio_crypt_free_ctx(bio);
return 0;
} }
rq->nr_phys_segments = nr_segs;
rq->bio = rq->biotail = bio;
rq->__data_len = bio->bi_iter.bi_size;
return 0; return 0;
} }
EXPORT_SYMBOL(blk_rq_append_bio); EXPORT_SYMBOL(blk_rq_append_bio);

4
block/blk-mq.c
View file

@ -2658,8 +2658,10 @@ static void blk_mq_bio_to_request(struct request *rq, struct bio *bio,
if (bio->bi_opf & REQ_RAHEAD) if (bio->bi_opf & REQ_RAHEAD)
rq->cmd_flags |= REQ_FAILFAST_MASK; rq->cmd_flags |= REQ_FAILFAST_MASK;
rq->bio = rq->biotail = bio;
rq->__sector = bio->bi_iter.bi_sector; rq->__sector = bio->bi_iter.bi_sector;
blk_rq_bio_prep(rq, bio, nr_segs); rq->__data_len = bio->bi_iter.bi_size;
rq->nr_phys_segments = nr_segs;
if (bio_integrity(bio)) if (bio_integrity(bio))
rq->nr_integrity_segments = blk_rq_count_integrity_sg(rq->q, rq->nr_integrity_segments = blk_rq_count_integrity_sg(rq->q,
bio); bio);

8
include/linux/blk-mq.h
View file

@ -978,14 +978,6 @@ static inline void blk_mq_cleanup_rq(struct request *rq)
rq->q->mq_ops->cleanup_rq(rq); rq->q->mq_ops->cleanup_rq(rq);
} }
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;
}
void blk_mq_hctx_set_fq_lock_class(struct blk_mq_hw_ctx *hctx, void blk_mq_hctx_set_fq_lock_class(struct blk_mq_hw_ctx *hctx,
struct lock_class_key *key); struct lock_class_key *key);