Commit c1a79b1a authored by Naohiro Aota's avatar Naohiro Aota Committed by David Sterba
Browse files

block: introduce zone capacity helper 



{bdev,disk}_zone_capacity() takes block_device or gendisk and sector position
and returns the zone capacity of the corresponding zone.

With that, move disk_nr_zones() and blk_zone_plug_bio() to consolidate them in
the same #ifdef block.

Signed-off-by: default avatarNaohiro Aota <naohiro.aota@wdc.com>
Reviewed-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent f1ab0171

include/linux/blkdev.h

+45 −22
Original line number Diff line number Diff line
@@ -691,23 +691,6 @@ static inline bool blk_queue_is_zoned(struct request_queue *q) 
		(q->limits.features & BLK_FEAT_ZONED);

}



#ifdef CONFIG_BLK_DEV_ZONED

static inline unsigned int disk_nr_zones(struct gendisk *disk)

{

	return disk->nr_zones;

}

bool blk_zone_plug_bio(struct bio *bio, unsigned int nr_segs);

#else /* CONFIG_BLK_DEV_ZONED */

static inline unsigned int disk_nr_zones(struct gendisk *disk)

{

	return 0;

}

static inline bool blk_zone_plug_bio(struct bio *bio, unsigned int nr_segs)

{

	return false;

}

#endif /* CONFIG_BLK_DEV_ZONED */



static inline unsigned int disk_zone_no(struct gendisk *disk, sector_t sector)

{

	if (!blk_queue_is_zoned(disk->queue))
@@ -715,11 +698,6 @@ static inline unsigned int disk_zone_no(struct gendisk *disk, sector_t sector) 
	return sector >> ilog2(disk->queue->limits.chunk_sectors);

}



static inline unsigned int bdev_nr_zones(struct block_device *bdev)

{

	return disk_nr_zones(bdev->bd_disk);

}



static inline unsigned int bdev_max_open_zones(struct block_device *bdev)

{

	return bdev->bd_disk->queue->limits.max_open_zones;
@@ -826,6 +804,51 @@ static inline u64 sb_bdev_nr_blocks(struct super_block *sb) 
		(sb->s_blocksize_bits - SECTOR_SHIFT);

}



#ifdef CONFIG_BLK_DEV_ZONED

static inline unsigned int disk_nr_zones(struct gendisk *disk)

{

	return disk->nr_zones;

}

bool blk_zone_plug_bio(struct bio *bio, unsigned int nr_segs);



/**

 * disk_zone_capacity - returns the zone capacity of zone containing @sector

 * @disk:	disk to work with

 * @sector:	sector number within the querying zone

 *

 * Returns the zone capacity of a zone containing @sector. @sector can be any

 * sector in the zone.

 */

static inline unsigned int disk_zone_capacity(struct gendisk *disk,

					      sector_t sector)

{

	sector_t zone_sectors = disk->queue->limits.chunk_sectors;



	if (sector + zone_sectors >= get_capacity(disk))

		return disk->last_zone_capacity;

	return disk->zone_capacity;

}

static inline unsigned int bdev_zone_capacity(struct block_device *bdev,

					      sector_t pos)

{

	return disk_zone_capacity(bdev->bd_disk, pos);

}

#else /* CONFIG_BLK_DEV_ZONED */

static inline unsigned int disk_nr_zones(struct gendisk *disk)

{

	return 0;

}

static inline bool blk_zone_plug_bio(struct bio *bio, unsigned int nr_segs)

{

	return false;

}

#endif /* CONFIG_BLK_DEV_ZONED */



static inline unsigned int bdev_nr_zones(struct block_device *bdev)

{

	return disk_nr_zones(bdev->bd_disk);

}



int bdev_disk_changed(struct gendisk *disk, bool invalidate);



void put_disk(struct gendisk *disk);