diff options
| author | Max Gurtovoy | 2019-04-02 13:52:47 +0200 |
|---|---|---|
| committer | Christoph Hellwig | 2019-04-05 08:07:58 +0200 |
| commit | e84c2091a45228b62867ec0565898ef5404706a2 (patch) | |
| tree | aa13398b8e5af6589c508b70349f66f39404936b /drivers/nvme/target/core.c | |
| parent | nvme-pci: tidy up nvme_map_data (diff) | |
| download | kernel-qcow2-linux-e84c2091a45228b62867ec0565898ef5404706a2.tar.gz kernel-qcow2-linux-e84c2091a45228b62867ec0565898ef5404706a2.tar.xz kernel-qcow2-linux-e84c2091a45228b62867ec0565898ef5404706a2.zip | |
nvmet: never fail double namespace enablement
In case we create N namespaces while N < NVMET_MAX_NAMESPACES, we can
perform "echo 1 > <nsid>/enable" as much as we want. In case N ==
NVMET_MAX_NAMESPACES we fail. Make sure we have the same flow for any N.
Signed-off-by: Max Gurtovoy <maxg@mellanox.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/nvme/target/core.c')
| -rw-r--r-- | drivers/nvme/target/core.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/nvme/target/core.c b/drivers/nvme/target/core.c index b3e765a95af8..4dc388a2ecb0 100644 --- a/drivers/nvme/target/core.c +++ b/drivers/nvme/target/core.c @@ -494,13 +494,14 @@ int nvmet_ns_enable(struct nvmet_ns *ns) int ret; mutex_lock(&subsys->lock); - ret = -EMFILE; - if (subsys->nr_namespaces == NVMET_MAX_NAMESPACES) - goto out_unlock; ret = 0; if (ns->enabled) goto out_unlock; + ret = -EMFILE; + if (subsys->nr_namespaces == NVMET_MAX_NAMESPACES) + goto out_unlock; + ret = nvmet_bdev_ns_enable(ns); if (ret == -ENOTBLK) ret = nvmet_file_ns_enable(ns); |