OSDN Git Service

nvmet: replace ida_simple[get|remove] with the simler ida_[alloc|free]
authorSagi Grimberg <sagi@grimberg.me>
Mon, 14 Feb 2022 09:07:29 +0000 (11:07 +0200)
committerChristoph Hellwig <hch@lst.de>
Mon, 28 Feb 2022 11:45:05 +0000 (13:45 +0200)
ida_simple_[get|remove] are wrappers anyways.

Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
drivers/nvme/target/core.c

index 5119c68..724a6d3 100644 (file)
@@ -1400,7 +1400,7 @@ u16 nvmet_alloc_ctrl(const char *subsysnqn, const char *hostnqn,
        if (subsys->cntlid_min > subsys->cntlid_max)
                goto out_free_sqs;
 
-       ret = ida_simple_get(&cntlid_ida,
+       ret = ida_alloc_range(&cntlid_ida,
                             subsys->cntlid_min, subsys->cntlid_max,
                             GFP_KERNEL);
        if (ret < 0) {
@@ -1459,7 +1459,7 @@ static void nvmet_ctrl_free(struct kref *ref)
        flush_work(&ctrl->async_event_work);
        cancel_work_sync(&ctrl->fatal_err_work);
 
-       ida_simple_remove(&cntlid_ida, ctrl->cntlid);
+       ida_free(&cntlid_ida, ctrl->cntlid);
 
        nvmet_async_events_free(ctrl);
        kfree(ctrl->sqs);