Messages in this thread | | | Date | Mon, 30 May 2022 09:39:10 -0700 | Subject | Re: [PATCH] drivers: scsi: Directly use ida_alloc()/free() | From | Lee Duncan <> |
| |
On 5/27/22 01:30, keliu wrote: > Use ida_alloc()/ida_free() instead of deprecated > ida_simple_get()/ida_simple_remove() . > > Signed-off-by: keliu <liuke94@huawei.com> > --- > drivers/scsi/hosts.c | 4 ++-- > drivers/scsi/scsi_transport_iscsi.c | 6 +++--- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c > index f69b77cbf538..ec16cfad034e 100644 > --- a/drivers/scsi/hosts.c > +++ b/drivers/scsi/hosts.c > @@ -350,7 +350,7 @@ static void scsi_host_dev_release(struct device *dev) > > kfree(shost->shost_data); > > - ida_simple_remove(&host_index_ida, shost->host_no); > + ida_free(&host_index_ida, shost->host_no); > > if (shost->shost_state != SHOST_CREATED) > put_device(parent); > @@ -395,7 +395,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize) > init_waitqueue_head(&shost->host_wait); > mutex_init(&shost->scan_mutex); > > - index = ida_simple_get(&host_index_ida, 0, 0, GFP_KERNEL); > + index = ida_alloc(&host_index_ida, GFP_KERNEL); > if (index < 0) { > kfree(shost); > return NULL; > diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c > index 2c0dd64159b0..2578db4c095d 100644 > --- a/drivers/scsi/scsi_transport_iscsi.c > +++ b/drivers/scsi/scsi_transport_iscsi.c > @@ -1975,7 +1975,7 @@ static void __iscsi_unbind_session(struct work_struct *work) > scsi_remove_target(&session->dev); > > if (session->ida_used) > - ida_simple_remove(&iscsi_sess_ida, target_id); > + ida_free(&iscsi_sess_ida, target_id); > > unbind_session_exit: > iscsi_session_event(session, ISCSI_KEVENT_UNBIND_SESSION); > @@ -2044,7 +2044,7 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id) > return -ENOMEM; > > if (target_id == ISCSI_MAX_TARGET) { > - id = ida_simple_get(&iscsi_sess_ida, 0, 0, GFP_KERNEL); > + id = ida_alloc(&iscsi_sess_ida, GFP_KERNEL); > > if (id < 0) { > iscsi_cls_session_printk(KERN_ERR, session, > @@ -2083,7 +2083,7 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id) > device_del(&session->dev); > release_ida: > if (session->ida_used) > - ida_simple_remove(&iscsi_sess_ida, session->target_id); > + ida_free(&iscsi_sess_ida, session->target_id); > destroy_wq: > destroy_workqueue(session->workq); > return err;
Reviewed-by: Lee Duncan <lduncan@suse.com>
| |