Merge branch 'nvme-4.18' of git://git.infradead.org/nvme into for-linus

[sfrench/cifs-2.6.git] / drivers / nvme / host / core.c

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 020a00f932a0352794a152e379772de814cb5d77..21710a7460c823bbc4f84134d7ecce70d3f993ba 100644 (file)
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -357,7 +357,7 @@ static void nvme_free_ns_head(struct kref *ref)
        nvme_mpath_remove_disk(head);
        ida_simple_remove(&head->subsys->ns_ida, head->instance);
        list_del_init(&head->entry);
        nvme_mpath_remove_disk(head);
        ida_simple_remove(&head->subsys->ns_ida, head->instance);
        list_del_init(&head->entry);

-       cleanup_srcu_struct(&head->srcu);
+       cleanup_srcu_struct_quiesced(&head->srcu);

        nvme_put_subsystem(head->subsys);
        kfree(head);
 }
        nvme_put_subsystem(head->subsys);
        kfree(head);
 }