Commit c30e8c4b authored by Damien Le Moal's avatar Damien Le Moal Committed by Jens Axboe
Browse files

block: remove disk_zone_is_full() 



The helper function disk_zone_is_full() is only used in
disk_zone_wplug_is_full(). So remove it and open code it directly in
this single caller.

Signed-off-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 1084e41d

block/blk-zoned.c

+3 −9
Original line number Diff line number Diff line
@@ -492,18 +492,12 @@ static bool disk_zone_is_last(struct gendisk *disk, struct blk_zone *zone) 
	return zone->start + zone->len >= get_capacity(disk);

}



static bool disk_zone_is_full(struct gendisk *disk,

			      unsigned int zno, unsigned int offset_in_zone)

{

	if (zno < disk->nr_zones - 1)

		return offset_in_zone >= disk->zone_capacity;

	return offset_in_zone >= disk->last_zone_capacity;

}



static bool disk_zone_wplug_is_full(struct gendisk *disk,

				    struct blk_zone_wplug *zwplug)

{

	return disk_zone_is_full(disk, zwplug->zone_no, zwplug->wp_offset);

	if (zwplug->zone_no < disk->nr_zones - 1)

		return zwplug->wp_offset >= disk->zone_capacity;

	return zwplug->wp_offset >= disk->last_zone_capacity;

}



static bool disk_insert_zone_wplug(struct gendisk *disk,