Commit db9f3847 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'block-5.7-2020-05-22' of git://git.kernel.dk/linux-block 

Pull block fixes from Jens Axboe:
 "Two fixes for null_blk zone mode"

* tag 'block-5.7-2020-05-22' of git://git.kernel.dk/linux-block:
  null_blk: don't allow discard for zoned mode
  null_blk: return error for invalid zone size
parents b09ca17a 1592cd15

drivers/block/null_blk_main.c

+7 −0
Original line number Diff line number Diff line
@@ -1535,6 +1535,13 @@ static void null_config_discard(struct nullb *nullb) 
{

	if (nullb->dev->discard == false)

		return;



	if (nullb->dev->zoned) {

		nullb->dev->discard = false;

		pr_info("discard option is ignored in zoned mode\n");

		return;

	}



	nullb->q->limits.discard_granularity = nullb->dev->blocksize;

	nullb->q->limits.discard_alignment = nullb->dev->blocksize;

	blk_queue_max_discard_sectors(nullb->q, UINT_MAX >> 9);

drivers/block/null_blk_zoned.c

+4 −0
Original line number Diff line number Diff line
@@ -23,6 +23,10 @@ int null_init_zoned_dev(struct nullb_device *dev, struct request_queue *q) 
		pr_err("zone_size must be power-of-two\n");

		return -EINVAL;

	}

	if (dev->zone_size > dev->size) {

		pr_err("Zone size larger than device capacity\n");

		return -EINVAL;

	}



	dev->zone_size_sects = dev->zone_size << ZONE_SIZE_SHIFT;

	dev->nr_zones = dev_size >>

CRA Git | Maintained and supported by SUSTech CRA and CCSE