nvmet: Change max_nsid in subsystem due to ns_disable if needed
authorRoy Shterman <roys@lightbitslabs.com>
Wed, 18 Oct 2017 10:46:07 +0000 (13:46 +0300)
committerChristoph Hellwig <hch@lst.de>
Fri, 20 Oct 2017 10:06:02 +0000 (12:06 +0200)
In case we disable namespaces which has the nsid like
subsystem max_nsid we need to search for the next largest nsid
in this subsystem. If the subsystem don't has more namespaces
we set it to 0, else we take nsid from the last namespace in
namespaces list because the list is sorted while inserting.

Reviewed-by: Max Gurtovoy <maxg@mellanox.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Roy Shterman <roys@lightbitslabs.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
[hch: slight refactor]
Signed-off-by: Christoph Hellwig <hch@lst.de>
drivers/nvme/target/core.c

index 1b208beeef5097c6e4a2bd38e112543b8818af19..da088293eafc196e77ab06cd74a744b7c53ea329 100644 (file)
@@ -57,6 +57,17 @@ u16 nvmet_copy_from_sgl(struct nvmet_req *req, off_t off, void *buf, size_t len)
        return 0;
 }
 
+static unsigned int nvmet_max_nsid(struct nvmet_subsys *subsys)
+{
+       struct nvmet_ns *ns;
+
+       if (list_empty(&subsys->namespaces))
+               return 0;
+
+       ns = list_last_entry(&subsys->namespaces, struct nvmet_ns, dev_link);
+       return ns->nsid;
+}
+
 static u32 nvmet_async_event_result(struct nvmet_async_event *aen)
 {
        return aen->event_type | (aen->event_info << 8) | (aen->log_page << 16);
@@ -334,6 +345,8 @@ void nvmet_ns_disable(struct nvmet_ns *ns)
 
        ns->enabled = false;
        list_del_rcu(&ns->dev_link);
+       if (ns->nsid == subsys->max_nsid)
+               subsys->max_nsid = nvmet_max_nsid(subsys);
        mutex_unlock(&subsys->lock);
 
        /*