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

block: refactor disk_zone_wplug_sync_wp_offset() 



The helper function blk_zone_wp_offset() is called from
disk_zone_wplug_sync_wp_offset(), and again called from
blk_revalidate_seq_zone() right after the call to
disk_zone_wplug_sync_wp_offset().

Change disk_zone_wplug_sync_wp_offset() to return the value of obtained
with blk_zone_wp_offset() to avoid this double call, which simplifies a
little blk_revalidate_seq_zone().

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

block/blk-zoned.c

+13 −14
Original line number Diff line number Diff line
@@ -817,25 +817,26 @@ static unsigned int blk_zone_wp_offset(struct blk_zone *zone) 
	}

}



static void disk_zone_wplug_sync_wp_offset(struct gendisk *disk,

static unsigned int disk_zone_wplug_sync_wp_offset(struct gendisk *disk,

						   struct blk_zone *zone)

{

	struct blk_zone_wplug *zwplug;

	unsigned long flags;

	unsigned int wp_offset = blk_zone_wp_offset(zone);



	zwplug = disk_get_zone_wplug(disk, zone->start);

	if (!zwplug)

		return;

	if (zwplug) {

		unsigned long flags;



		spin_lock_irqsave(&zwplug->lock, flags);

		if (zwplug->flags & BLK_ZONE_WPLUG_NEED_WP_UPDATE)

		disk_zone_wplug_set_wp_offset(disk, zwplug,

					      blk_zone_wp_offset(zone));

			disk_zone_wplug_set_wp_offset(disk, zwplug, wp_offset);

		spin_unlock_irqrestore(&zwplug->lock, flags);



		disk_put_zone_wplug(zwplug);

	}



	return wp_offset;

}



/**

 * disk_report_zone - Report one zone

 * @disk:	Target disk
@@ -2101,9 +2102,7 @@ static int blk_revalidate_seq_zone(struct blk_zone *zone, unsigned int idx, 
	if (!queue_emulates_zone_append(disk->queue) || !disk->zone_wplugs_hash)

		return 0;



	disk_zone_wplug_sync_wp_offset(disk, zone);



	wp_offset = blk_zone_wp_offset(zone);

	wp_offset = disk_zone_wplug_sync_wp_offset(disk, zone);

	if (!wp_offset || wp_offset >= zone->capacity)

		return 0;