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

Commit bc1c56fd authored by NeilBrown's avatar NeilBrown Committed by Jens Axboe
Browse files

Share code between init_request_from_bio and blk_rq_bio_prep 



These have very similar functions and should share code where
possible.

Signed-off-by: default avatarNeil Brown <neilb@suse.de>

diff .prev/block/ll_rw_blk.c ./block/ll_rw_blk.c
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 66846572

block/ll_rw_blk.c

+1 −7
Original line number Diff line number Diff line
@@ -2941,15 +2941,9 @@ static void init_request_from_bio(struct request *req, struct bio *bio) 


	req->errors = 0;

	req->hard_sector = req->sector = bio->bi_sector;

	req->hard_nr_sectors = req->nr_sectors = bio_sectors(bio);

	req->current_nr_sectors = req->hard_cur_sectors = bio_cur_sectors(bio);

	req->nr_phys_segments = bio_phys_segments(req->q, bio);

	req->nr_hw_segments = bio_hw_segments(req->q, bio);

	req->buffer = bio_data(bio);	/* see ->buffer comment above */

	req->bio = req->biotail = bio;

	req->ioprio = bio_prio(bio);

	req->rq_disk = bio->bi_bdev->bd_disk;

	req->start_time = jiffies;

	blk_rq_bio_prep(req->q, req, bio);

}



static int __make_request(struct request_queue *q, struct bio *bio)