block: inherit the zoned characteristics in blk_stack_limits (3093a479) · Commits · 戴 / test

block/blk-settings.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -609,6 +609,7 @@ int blk_stack_limits(struct queue_limits t, struct queue_limits b,
	t->chunk_sectors = min_not_zero(t->chunk_sectors,		t->chunk_sectors = min_not_zero(t->chunk_sectors,
	b->chunk_sectors);		b->chunk_sectors);

			t->zoned = max(t->zoned, b->zoned);
	return ret;		return ret;
	}		}
	EXPORT_SYMBOL(blk_stack_limits);		EXPORT_SYMBOL(blk_stack_limits);

+0 −19

Original line number	Original line	Diff line number	Diff line
	@@ -467,9 +467,6 @@ static int dm_set_device_limits(struct dm_target ti, struct dm_dev dev,
	q->limits.logical_block_size,		q->limits.logical_block_size,
	q->limits.alignment_offset,		q->limits.alignment_offset,
	(unsigned long long) start << SECTOR_SHIFT);		(unsigned long long) start << SECTOR_SHIFT);

	limits->zoned = blk_queue_zoned_model(q);

	return 0;		return 0;
	}		}

	@@ -1528,22 +1525,6 @@ combine_limits:
	dm_device_name(table->md),		dm_device_name(table->md),
	(unsigned long long) ti->begin,		(unsigned long long) ti->begin,
	(unsigned long long) ti->len);		(unsigned long long) ti->len);

	/*
	* FIXME: this should likely be moved to blk_stack_limits(), would
	* also eliminate limits->zoned stacking hack in dm_set_device_limits()
	*/
	if (limits->zoned == BLK_ZONED_NONE && ti_limits.zoned != BLK_ZONED_NONE) {
	/*
	* By default, the stacked limits zoned model is set to
	* BLK_ZONED_NONE in blk_set_stacking_limits(). Update
	* this model using the first target model reported
	* that is not BLK_ZONED_NONE. This will be either the
	* first target device zoned model or the model reported
	* by the target .io_hints.
	*/
	limits->zoned = ti_limits.zoned;
	}
	}		}

	/*		/*

+6 −3

Original line number	Original line	Diff line number	Diff line
	@@ -306,9 +306,12 @@ enum blk_queue_state {

	/*		/*
	* Zoned block device models (zoned limit).		* Zoned block device models (zoned limit).
			*
			* Note: This needs to be ordered from the least to the most severe
			* restrictions for the inheritance in blk_stack_limits() to work.
	*/		*/
	enum blk_zoned_model {		enum blk_zoned_model {
	BLK_ZONED_NONE, /* Regular block device */		BLK_ZONED_NONE = 0, /* Regular block device */
	BLK_ZONED_HA, /* Host-aware zoned block device */		BLK_ZONED_HA, /* Host-aware zoned block device */
	BLK_ZONED_HM, /* Host-managed zoned block device */		BLK_ZONED_HM, /* Host-managed zoned block device */
	};		};