]> git.ipfire.org Git - people/ms/linux.git/commitdiff
nvmet-tcp: replace ida_simple[get|remove] with the simler ida_[alloc|free]
authorSagi Grimberg <sagi@grimberg.me>
Mon, 14 Feb 2022 09:07:32 +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/tcp.c

index 7c1c43ce466bcbab9a98414bb3c0d74f1f35139b..83ca577f72be2407813113f3af6a45680fb08ac3 100644 (file)
@@ -1473,7 +1473,7 @@ static void nvmet_tcp_release_queue_work(struct work_struct *w)
        nvmet_tcp_free_cmds(queue);
        if (queue->hdr_digest || queue->data_digest)
                nvmet_tcp_free_crypto(queue);
-       ida_simple_remove(&nvmet_tcp_queue_ida, queue->idx);
+       ida_free(&nvmet_tcp_queue_ida, queue->idx);
 
        page = virt_to_head_page(queue->pf_cache.va);
        __page_frag_cache_drain(page, queue->pf_cache.pagecnt_bias);
@@ -1613,7 +1613,7 @@ static int nvmet_tcp_alloc_queue(struct nvmet_tcp_port *port,
        init_llist_head(&queue->resp_list);
        INIT_LIST_HEAD(&queue->resp_send_list);
 
-       queue->idx = ida_simple_get(&nvmet_tcp_queue_ida, 0, 0, GFP_KERNEL);
+       queue->idx = ida_alloc(&nvmet_tcp_queue_ida, GFP_KERNEL);
        if (queue->idx < 0) {
                ret = queue->idx;
                goto out_free_queue;
@@ -1646,7 +1646,7 @@ out_destroy_sq:
 out_free_connect:
        nvmet_tcp_free_cmd(&queue->connect);
 out_ida_remove:
-       ida_simple_remove(&nvmet_tcp_queue_ida, queue->idx);
+       ida_free(&nvmet_tcp_queue_ida, queue->idx);
 out_free_queue:
        kfree(queue);
        return ret;