Commit 6dd0f465 authored by Sagi Grimberg's avatar Sagi Grimberg Committed by Christoph Hellwig

nvmet-fc: replace ida_simple[get|remove] with the simler ida_[alloc|free]

ida_simple_[get|remove] are wrappers anyways.
Signed-off-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarKeith Busch <kbusch@kernel.org>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 22027a98
...@@ -1115,7 +1115,7 @@ nvmet_fc_alloc_target_assoc(struct nvmet_fc_tgtport *tgtport, void *hosthandle) ...@@ -1115,7 +1115,7 @@ nvmet_fc_alloc_target_assoc(struct nvmet_fc_tgtport *tgtport, void *hosthandle)
if (!assoc) if (!assoc)
return NULL; return NULL;
idx = ida_simple_get(&tgtport->assoc_cnt, 0, 0, GFP_KERNEL); idx = ida_alloc(&tgtport->assoc_cnt, GFP_KERNEL);
if (idx < 0) if (idx < 0)
goto out_free_assoc; goto out_free_assoc;
...@@ -1157,7 +1157,7 @@ nvmet_fc_alloc_target_assoc(struct nvmet_fc_tgtport *tgtport, void *hosthandle) ...@@ -1157,7 +1157,7 @@ nvmet_fc_alloc_target_assoc(struct nvmet_fc_tgtport *tgtport, void *hosthandle)
out_put: out_put:
nvmet_fc_tgtport_put(tgtport); nvmet_fc_tgtport_put(tgtport);
out_ida: out_ida:
ida_simple_remove(&tgtport->assoc_cnt, idx); ida_free(&tgtport->assoc_cnt, idx);
out_free_assoc: out_free_assoc:
kfree(assoc); kfree(assoc);
return NULL; return NULL;
...@@ -1183,7 +1183,7 @@ nvmet_fc_target_assoc_free(struct kref *ref) ...@@ -1183,7 +1183,7 @@ nvmet_fc_target_assoc_free(struct kref *ref)
/* if pending Rcv Disconnect Association LS, send rsp now */ /* if pending Rcv Disconnect Association LS, send rsp now */
if (oldls) if (oldls)
nvmet_fc_xmt_ls_rsp(tgtport, oldls); nvmet_fc_xmt_ls_rsp(tgtport, oldls);
ida_simple_remove(&tgtport->assoc_cnt, assoc->a_id); ida_free(&tgtport->assoc_cnt, assoc->a_id);
dev_info(tgtport->dev, dev_info(tgtport->dev,
"{%d:%d} Association freed\n", "{%d:%d} Association freed\n",
tgtport->fc_target_port.port_num, assoc->a_id); tgtport->fc_target_port.port_num, assoc->a_id);
...@@ -1383,7 +1383,7 @@ nvmet_fc_register_targetport(struct nvmet_fc_port_info *pinfo, ...@@ -1383,7 +1383,7 @@ nvmet_fc_register_targetport(struct nvmet_fc_port_info *pinfo,
goto out_regtgt_failed; goto out_regtgt_failed;
} }
idx = ida_simple_get(&nvmet_fc_tgtport_cnt, 0, 0, GFP_KERNEL); idx = ida_alloc(&nvmet_fc_tgtport_cnt, GFP_KERNEL);
if (idx < 0) { if (idx < 0) {
ret = -ENOSPC; ret = -ENOSPC;
goto out_fail_kfree; goto out_fail_kfree;
...@@ -1433,7 +1433,7 @@ nvmet_fc_register_targetport(struct nvmet_fc_port_info *pinfo, ...@@ -1433,7 +1433,7 @@ nvmet_fc_register_targetport(struct nvmet_fc_port_info *pinfo,
out_free_newrec: out_free_newrec:
put_device(dev); put_device(dev);
out_ida_put: out_ida_put:
ida_simple_remove(&nvmet_fc_tgtport_cnt, idx); ida_free(&nvmet_fc_tgtport_cnt, idx);
out_fail_kfree: out_fail_kfree:
kfree(newrec); kfree(newrec);
out_regtgt_failed: out_regtgt_failed:
...@@ -1460,7 +1460,7 @@ nvmet_fc_free_tgtport(struct kref *ref) ...@@ -1460,7 +1460,7 @@ nvmet_fc_free_tgtport(struct kref *ref)
/* let the LLDD know we've finished tearing it down */ /* let the LLDD know we've finished tearing it down */
tgtport->ops->targetport_delete(&tgtport->fc_target_port); tgtport->ops->targetport_delete(&tgtport->fc_target_port);
ida_simple_remove(&nvmet_fc_tgtport_cnt, ida_free(&nvmet_fc_tgtport_cnt,
tgtport->fc_target_port.port_num); tgtport->fc_target_port.port_num);
ida_destroy(&tgtport->assoc_cnt); ida_destroy(&tgtport->assoc_cnt);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment