ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

block: remove blk_queue_zone_sectors

Browse Source 
Always use bdev_zone_sectors instead.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Link: https://lore.kernel.org/r/20220706070350.1703384-16-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig
2022-07-06 09:03:49 +02:00
committed by Jens Axboe
parent fabed68c27
commit de71973c29
3 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/md/dm-table.c
View File

@@ -1620,13 +1620,11 @@ static bool dm_table_supports_zoned_model(struct dm_table *t,
static int device_not_matches_zone_sectors(struct dm_target *ti, struct dm_dev *dev, static int device_not_matches_zone_sectors(struct dm_target *ti, struct dm_dev *dev,
sector_t start, sector_t len, void *data) sector_t start, sector_t len, void *data)
{ {
struct request_queue *q = bdev_get_queue(dev->bdev);
unsigned int *zone_sectors = data; unsigned int *zone_sectors = data;
if (!bdev_is_zoned(dev->bdev)) if (!bdev_is_zoned(dev->bdev))
return 0; return 0;
return bdev_zone_sectors(dev->bdev) != *zone_sectors;
return blk_queue_zone_sectors(q) != *zone_sectors;
} }
/* /*

10
drivers/md/dm-zone.c
View File

@@ -334,7 +334,7 @@ static int dm_update_zone_wp_offset_cb(struct blk_zone *zone, unsigned int idx,
static int dm_update_zone_wp_offset(struct mapped_device *md, unsigned int zno, static int dm_update_zone_wp_offset(struct mapped_device *md, unsigned int zno,
unsigned int *wp_ofst) unsigned int *wp_ofst)
{ {
sector_t sector = zno * blk_queue_zone_sectors(md->queue); sector_t sector = zno * bdev_zone_sectors(md->disk->part0);
unsigned int noio_flag; unsigned int noio_flag;
struct dm_table *t; struct dm_table *t;
int srcu_idx, ret; int srcu_idx, ret;
@@ -373,7 +373,7 @@ struct orig_bio_details {
static bool dm_zone_map_bio_begin(struct mapped_device *md, static bool dm_zone_map_bio_begin(struct mapped_device *md,
unsigned int zno, struct bio *clone) unsigned int zno, struct bio *clone)
{ {
sector_t zsectors = blk_queue_zone_sectors(md->queue); sector_t zsectors = bdev_zone_sectors(md->disk->part0);
unsigned int zwp_offset = READ_ONCE(md->zwp_offset[zno]); unsigned int zwp_offset = READ_ONCE(md->zwp_offset[zno]);
/* /*
@@ -443,7 +443,7 @@ static blk_status_t dm_zone_map_bio_end(struct mapped_device *md, unsigned int z
return BLK_STS_OK; return BLK_STS_OK;
case REQ_OP_ZONE_FINISH: case REQ_OP_ZONE_FINISH:
WRITE_ONCE(md->zwp_offset[zno], WRITE_ONCE(md->zwp_offset[zno],
blk_queue_zone_sectors(md->queue)); bdev_zone_sectors(md->disk->part0));
return BLK_STS_OK; return BLK_STS_OK;
case REQ_OP_WRITE_ZEROES: case REQ_OP_WRITE_ZEROES:
case REQ_OP_WRITE: case REQ_OP_WRITE:
@@ -593,6 +593,7 @@ void dm_zone_endio(struct dm_io *io, struct bio *clone)
{ {
struct mapped_device *md = io->md; struct mapped_device *md = io->md;
struct request_queue *q = md->queue; struct request_queue *q = md->queue;
struct gendisk *disk = md->disk;
struct bio *orig_bio = io->orig_bio; struct bio *orig_bio = io->orig_bio;
unsigned int zwp_offset; unsigned int zwp_offset;
unsigned int zno; unsigned int zno;
@@ -608,7 +609,8 @@ void dm_zone_endio(struct dm_io *io, struct bio *clone)
*/ */
if (clone->bi_status == BLK_STS_OK && if (clone->bi_status == BLK_STS_OK &&
bio_op(clone) == REQ_OP_ZONE_APPEND) { bio_op(clone) == REQ_OP_ZONE_APPEND) {
sector_t mask = (sector_t)blk_queue_zone_sectors(q) - 1; sector_t mask =
(sector_t)bdev_zone_sectors(disk->part0) - 1;
orig_bio->bi_iter.bi_sector += orig_bio->bi_iter.bi_sector +=
clone->bi_iter.bi_sector & mask; clone->bi_iter.bi_sector & mask;

11
include/linux/blkdev.h
View File

@@ -667,11 +667,6 @@ static inline bool blk_queue_is_zoned(struct request_queue *q)
} }
} }
static inline sector_t blk_queue_zone_sectors(struct request_queue *q)
{
return blk_queue_is_zoned(q) ? q->limits.chunk_sectors : 0;
}
#ifdef CONFIG_BLK_DEV_ZONED #ifdef CONFIG_BLK_DEV_ZONED
static inline unsigned int blk_queue_nr_zones(struct request_queue *q) static inline unsigned int blk_queue_nr_zones(struct request_queue *q)
{ {
@@ -1310,9 +1305,9 @@ static inline sector_t bdev_zone_sectors(struct block_device *bdev)
{ {
struct request_queue *q = bdev_get_queue(bdev); struct request_queue *q = bdev_get_queue(bdev);
if (q) if (!blk_queue_is_zoned(q))
return blk_queue_zone_sectors(q); return 0;
return 0; return q->limits.chunk_sectors;
} }
static inline int queue_dma_alignment(const struct request_queue *q) static inline int queue_dma_alignment(const struct request_queue *q)