diff options
| author | Keith Busch <kbusch@kernel.org> | 2020-04-09 09:09:02 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-05-09 16:18:35 -0600 |
| commit | 0c284db7f23571f6428c44ca714f13a1fc5f70df (patch) | |
| tree | 0e295d9928b2faad3f48ab015843df4635c1bcce /drivers/nvme/host | |
| parent | 9ad1927a3bc2735996ccc74e31b68a41ae9a3d33 (diff) | |
| download | linux-0c284db7f23571f6428c44ca714f13a1fc5f70df.tar.gz linux-0c284db7f23571f6428c44ca714f13a1fc5f70df.tar.bz2 linux-0c284db7f23571f6428c44ca714f13a1fc5f70df.zip | |
nvme: check namespace head shared property
Reject a new shared namespace if a duplicate unshared namespace exists.
Signed-off-by: Keith Busch <kbusch@kernel.org>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/nvme/host')
| -rw-r--r-- | drivers/nvme/host/core.c | 3 | ||||
| -rw-r--r-- | drivers/nvme/host/nvme.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 6093c8baf809..6437f2273785 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -3496,8 +3496,9 @@ static int nvme_init_ns_head(struct nvme_ns *ns, unsigned nsid, ret = PTR_ERR(head); goto out_unlock; } + head->shared = is_shared; } else { - if (!is_shared) { + if (!is_shared || !head->shared) { dev_err(ctrl->device, "Duplicate unshared namespace %d\n", nsid); diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h index 36f44b79bb3b..6222439a0776 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h @@ -352,6 +352,7 @@ struct nvme_ns_head { struct nvme_ns_ids ids; struct list_head entry; struct kref ref; + bool shared; int instance; #ifdef CONFIG_NVME_MULTIPATH struct gendisk *disk; |