nvme: remove ns->disk checks
Christoph Hellwig
maintainerPATCH 1/1 nvme: remove ns->disk checks
By the time a namespace is added to ctrl->namespaces list and thus can be looked up ns->disk has been assigned, and it it never cleared.
Remove all the checks for ns->disk being NULL.
--- drivers/nvme/host/core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/nvme/host/core.c +4 -4
@@ -100,7 +100,7 @@ static void nvme_set_queue_dying(struct nvme_ns *ns)* Revalidating a dead namespace sets capacity to 0. This will end * buffered writers dirtying pages that can't be synced. */ -if (!ns->disk ||test_and_set_bit (NVME_NS_DEAD , &ns->flags)) +if (test_and_set_bit (NVME_NS_DEAD , &ns->flags))return ;blk_set_queue_dying (ns->queue);/* Forcibly unquiesce queues to avoid blocking dispatch */
@@ -1429,7 +1429,7 @@ static void nvme_update_formats(struct nvme_ctrl *ctrl, u32 *effects)down_read (&ctrl->namespaces_rwsem);list_for_each_entry (ns, &ctrl->namespaces, list) -if (ns->disk &&_nvme_revalidate_disk (ns->disk)) +if (_nvme_revalidate_disk (ns->disk))nvme_set_queue_dying (ns);else if (blk_queue_is_zoned (ns->disk->queue)) {/*
@@ -3933,7 +3933,7 @@ static void nvme_ns_remove(struct nvme_ns *ns)nvme_mpath_clear_current_path (ns);synchronize_srcu (&ns->head->srcu);/* wait for concurrent submissions */ -if (ns->disk && ns->disk->flags &GENHD_FL_UP ) { +if (ns->disk->flags &GENHD_FL_UP ) {del_gendisk (ns->disk);blk_cleanup_queue (ns->queue);if (blk_get_integrity (ns->disk))
@@ -3964,7 +3964,7 @@ static void nvme_validate_ns(struct nvme_ctrl *ctrl, unsigned nsid) ns =nvme_find_get_ns (ctrl, nsid);if (ns) { -if (ns->disk &&revalidate_disk (ns->disk)) +if (revalidate_disk (ns->disk))nvme_ns_remove (ns);nvme_put_ns (ns); }else
Signature · 7 lines
2.26.2 _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Quoted 6 lines · Christoph Hellwig
By the time a namespace is added to
ctrl->namespaceslist and thus can be looked upns->diskhas been assigned, and it it never cleared.Remove all the checks for
ns->diskbeing NULL.Signed-off-by Christoph Hellwig<[email protected]>
Looks good to me.
_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme
Quoted 4 lines · Christoph Hellwig
By the time a namespace is added to
ctrl->namespaceslist and thus can be looked upns->diskhas been assigned, and it it never cleared.Remove all the checks for
ns->diskbeing NULL.
Looks like all these pointless checks were from an older interaction with lightnvm that is no longer applicable, so looks good.
_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme