diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-05-22 11:10:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-05-22 11:10:42 -0700 |
| commit | db9f384785b15e8569910c8e2ea1ffc83aedbff6 (patch) | |
| tree | 069751bd1ade93cdcb8ad0aaae2bbc1fa95212e2 | |
| parent | b09ca17a2a082299c787025b6c3e614a24a24ca8 (diff) | |
| parent | 1592cd15eec6e2952453f9a82da6e8a53e2b8db5 (diff) | |
| download | dma-buf-db9f384785b15e8569910c8e2ea1ffc83aedbff6.tar.gz | |
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
| -rw-r--r-- | drivers/block/null_blk_main.c | 7 | ||||
| -rw-r--r-- | drivers/block/null_blk_zoned.c | 4 |
2 files changed, 11 insertions, 0 deletions
diff --git a/drivers/block/null_blk_main.c b/drivers/block/null_blk_main.c index 8efd8778e2095e..ce9e33603a4d95 100644 --- a/drivers/block/null_blk_main.c +++ b/drivers/block/null_blk_main.c @@ -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); diff --git a/drivers/block/null_blk_zoned.c b/drivers/block/null_blk_zoned.c index 9e4bcdad1a80f7..ed5458f2d367de 100644 --- a/drivers/block/null_blk_zoned.c +++ b/drivers/block/null_blk_zoned.c @@ -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 >> |