block: Introduce blk_zone_update_request_bio()
On completion of a zone append request, the request sector indicates the location of the written data. This value must be returned to the user through the BIO iter sector. This is done in 2 places: in blk_complete_request() and in blk_update_request(). Introduce the inline helper function blk_zone_update_request_bio() to avoid duplicating this BIO update for zone append requests, and to compile out this helper call when CONFIG_BLK_DEV_ZONED is not enabled. Signed-off-by: Damien Le Moal <dlemoal@kernel.org> Reviewed-by: Hannes Reinecke <hare@suse.de> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Bart Van Assche <bvanassche@acm.org> Tested-by: Hans Holmberg <hans.holmberg@wdc.com> Tested-by: Dennis Maisenbacher <dennis.maisenbacher@wdc.com> Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com> Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com> Link: https://lore.kernel.org/r/20240408014128.205141-4-dlemoal@kernel.org Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
parent
c0da26f950
commit
a0508c36ef
@ -821,8 +821,7 @@ static void blk_complete_request(struct request *req)
|
||||
/* Completion has already been traced */
|
||||
bio_clear_flag(bio, BIO_TRACE_COMPLETION);
|
||||
|
||||
if (req_op(req) == REQ_OP_ZONE_APPEND)
|
||||
bio->bi_iter.bi_sector = req->__sector;
|
||||
blk_zone_update_request_bio(req, bio);
|
||||
|
||||
if (!is_flush)
|
||||
bio_endio(bio);
|
||||
@ -923,10 +922,10 @@ bool blk_update_request(struct request *req, blk_status_t error,
|
||||
bio_advance(bio, bio_bytes);
|
||||
|
||||
/* Don't actually finish bio if it's part of flush sequence */
|
||||
if (!bio->bi_iter.bi_size && !is_flush) {
|
||||
if (req_op(req) == REQ_OP_ZONE_APPEND)
|
||||
bio->bi_iter.bi_sector = req->__sector;
|
||||
bio_endio(bio);
|
||||
if (!bio->bi_iter.bi_size) {
|
||||
blk_zone_update_request_bio(req, bio);
|
||||
if (!is_flush)
|
||||
bio_endio(bio);
|
||||
}
|
||||
|
||||
total_bytes += bio_bytes;
|
||||
|
19
block/blk.h
19
block/blk.h
@ -408,12 +408,29 @@ static inline struct bio *blk_queue_bounce(struct bio *bio,
|
||||
|
||||
#ifdef CONFIG_BLK_DEV_ZONED
|
||||
void disk_free_zone_bitmaps(struct gendisk *disk);
|
||||
static inline void blk_zone_update_request_bio(struct request *rq,
|
||||
struct bio *bio)
|
||||
{
|
||||
/*
|
||||
* For zone append requests, the request sector indicates the location
|
||||
* at which the BIO data was written. Return this value to the BIO
|
||||
* issuer through the BIO iter sector.
|
||||
*/
|
||||
if (req_op(rq) == REQ_OP_ZONE_APPEND)
|
||||
bio->bi_iter.bi_sector = rq->__sector;
|
||||
}
|
||||
int blkdev_report_zones_ioctl(struct block_device *bdev, unsigned int cmd,
|
||||
unsigned long arg);
|
||||
int blkdev_zone_mgmt_ioctl(struct block_device *bdev, blk_mode_t mode,
|
||||
unsigned int cmd, unsigned long arg);
|
||||
#else /* CONFIG_BLK_DEV_ZONED */
|
||||
static inline void disk_free_zone_bitmaps(struct gendisk *disk) {}
|
||||
static inline void disk_free_zone_bitmaps(struct gendisk *disk)
|
||||
{
|
||||
}
|
||||
static inline void blk_zone_update_request_bio(struct request *rq,
|
||||
struct bio *bio)
|
||||
{
|
||||
}
|
||||
static inline int blkdev_report_zones_ioctl(struct block_device *bdev,
|
||||
unsigned int cmd, unsigned long arg)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user