Merge branch 'ida-4.19' of git://git.infradead.org/users/willy/linux-dax

Pull IDA updates from Matthew Wilcox:
 "A better IDA API:

      id = ida_alloc(ida, GFP_xxx);
      ida_free(ida, id);

  rather than the cumbersome ida_simple_get(), ida_simple_remove().

  The new IDA API is similar to ida_simple_get() but better named.  The
  internal restructuring of the IDA code removes the bitmap
  preallocation nonsense.

  I hope the net -200 lines of code is convincing"

* 'ida-4.19' of git://git.infradead.org/users/willy/linux-dax: (29 commits)
  ida: Change ida_get_new_above to return the id
  ida: Remove old API
  test_ida: check_ida_destroy and check_ida_alloc
  test_ida: Convert check_ida_conv to new API
  test_ida: Move ida_check_max
  test_ida: Move ida_check_leaf
  idr-test: Convert ida_check_nomem to new API
  ida: Start new test_ida module
  target/iscsi: Allocate session IDs from an IDA
  iscsi target: fix session creation failure handling
  drm/vmwgfx: Convert to new IDA API
  dmaengine: Convert to new IDA API
  ppc: Convert vas ID allocation to new IDA API
  media: Convert entity ID allocation to new IDA API
  ppc: Convert mmu context allocation to new IDA API
  Convert net_namespace to new IDA API
  cb710: Convert to new IDA API
  rsxx: Convert to new IDA API
  osd: Convert to new IDA API
  sd: Convert to new IDA API
  ...

11 files changed, 72 insertions, 179 deletions

diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c
index db253cd5b32a..d0666f5ce003 100644
--- a/drivers/block/mtip32xx/mtip32xx.c
+++ b/drivers/block/mtip32xx/mtip32xx.c
@@ -118,7 +118,6 @@ static struct dentry *dfs_device_status;
 
 static u32 cpu_use[NR_CPUS];
 
-static DEFINE_SPINLOCK(rssd_index_lock);
 static DEFINE_IDA(rssd_index_ida);
 
 static int mtip_block_initialize(struct driver_data *dd);
@@ -3767,20 +3766,10 @@ static int mtip_block_initialize(struct driver_data *dd)
                 goto alloc_disk_error;
         }
 
-        /* Generate the disk name, implemented same as in sd.c */
-        do {
-                if (!ida_pre_get(&rssd_index_ida, GFP_KERNEL)) {
-                        rv = -ENOMEM;
-                        goto ida_get_error;
-                }
-
-                spin_lock(&rssd_index_lock);
-                rv = ida_get_new(&rssd_index_ida, &index);
-                spin_unlock(&rssd_index_lock);
-        } while (rv == -EAGAIN);
-
-        if (rv)
+        rv = ida_alloc(&rssd_index_ida, GFP_KERNEL);
+        if (rv < 0)
                 goto ida_get_error;
+        index = rv;
 
         rv = rssd_disk_name_format("rssd",
                                 index,
@@ -3922,9 +3911,7 @@ block_queue_alloc_init_error:
 block_queue_alloc_tag_error:
         mtip_hw_debugfs_exit(dd);
 disk_index_error:
-        spin_lock(&rssd_index_lock);
-        ida_remove(&rssd_index_ida, index);
-        spin_unlock(&rssd_index_lock);
+        ida_free(&rssd_index_ida, index);
 
 ida_get_error:
         put_disk(dd->disk);
@@ -4012,9 +3999,7 @@ static int mtip_block_remove(struct driver_data *dd)
         }
         dd->disk  = NULL;
 
-        spin_lock(&rssd_index_lock);
-        ida_remove(&rssd_index_ida, dd->index);
-        spin_unlock(&rssd_index_lock);
+        ida_free(&rssd_index_ida, dd->index);
 
         /* De-initialize the protocol layer. */
         mtip_hw_exit(dd);
@@ -4054,9 +4039,7 @@ static int mtip_block_shutdown(struct driver_data *dd)
                 dd->queue = NULL;
         }
 
-        spin_lock(&rssd_index_lock);
-        ida_remove(&rssd_index_ida, dd->index);
-        spin_unlock(&rssd_index_lock);
+        ida_free(&rssd_index_ida, dd->index);
         return 0;
 }
 
diff --git a/drivers/block/rsxx/core.c b/drivers/block/rsxx/core.c
index b7d71914a32a..f2c631ce793c 100644
--- a/drivers/block/rsxx/core.c
+++ b/drivers/block/rsxx/core.c
@@ -58,7 +58,6 @@ MODULE_PARM_DESC(sync_start, "On by Default: Driver load will not complete "
                              "until the card startup has completed.");
 
 static DEFINE_IDA(rsxx_disk_ida);
-static DEFINE_SPINLOCK(rsxx_ida_lock);
 
 /* --------------------Debugfs Setup ------------------- */
 
@@ -771,19 +770,10 @@ static int rsxx_pci_probe(struct pci_dev *dev,
         card->dev = dev;
         pci_set_drvdata(dev, card);
 
-        do {
-                if (!ida_pre_get(&rsxx_disk_ida, GFP_KERNEL)) {
-                        st = -ENOMEM;
-                        goto failed_ida_get;
-                }
-
-                spin_lock(&rsxx_ida_lock);
-                st = ida_get_new(&rsxx_disk_ida, &card->disk_id);
-                spin_unlock(&rsxx_ida_lock);
-        } while (st == -EAGAIN);
-
-        if (st)
+        st = ida_alloc(&rsxx_disk_ida, GFP_KERNEL);
+        if (st < 0)
                 goto failed_ida_get;
+        card->disk_id = st;
 
         st = pci_enable_device(dev);
         if (st)
@@ -985,9 +975,7 @@ failed_request_regions:
 failed_dma_mask:
         pci_disable_device(dev);
 failed_enable:
-        spin_lock(&rsxx_ida_lock);
-        ida_remove(&rsxx_disk_ida, card->disk_id);
-        spin_unlock(&rsxx_ida_lock);
+        ida_free(&rsxx_disk_ida, card->disk_id);
 failed_ida_get:
         kfree(card);
 
@@ -1050,6 +1038,7 @@ static void rsxx_pci_remove(struct pci_dev *dev)
         pci_disable_device(dev);
         pci_release_regions(dev);
 
+        ida_free(&rsxx_disk_ida, card->disk_id);
         kfree(card);
 }
 
diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c
index 272bed6c8ba7..f1a441ab395d 100644
--- a/drivers/dma/dmaengine.c
+++ b/drivers/dma/dmaengine.c
@@ -161,9 +161,7 @@ static void chan_dev_release(struct device *dev)
 
         chan_dev = container_of(dev, typeof(*chan_dev), device);
         if (atomic_dec_and_test(chan_dev->idr_ref)) {
-                mutex_lock(&dma_list_mutex);
-                ida_remove(&dma_ida, chan_dev->dev_id);
-                mutex_unlock(&dma_list_mutex);
+                ida_free(&dma_ida, chan_dev->dev_id);
                 kfree(chan_dev->idr_ref);
         }
         kfree(chan_dev);
@@ -898,17 +896,12 @@ static bool device_has_all_tx_types(struct dma_device *device)
 
 static int get_dma_id(struct dma_device *device)
 {
-        int rc;
-
-        do {
-                if (!ida_pre_get(&dma_ida, GFP_KERNEL))
-                        return -ENOMEM;
-                mutex_lock(&dma_list_mutex);
-                rc = ida_get_new(&dma_ida, &device->dev_id);
-                mutex_unlock(&dma_list_mutex);
-        } while (rc == -EAGAIN);
+        int rc = ida_alloc(&dma_ida, GFP_KERNEL);
 
-        return rc;
+        if (rc < 0)
+                return rc;
+        device->dev_id = rc;
+        return 0;
 }
 
 /**
@@ -1092,9 +1085,7 @@ int dma_async_device_register(struct dma_device *device)
 err_out:
         /* if we never registered a channel just release the idr */
         if (atomic_read(idr_ref) == 0) {
-                mutex_lock(&dma_list_mutex);
-                ida_remove(&dma_ida, device->dev_id);
-                mutex_unlock(&dma_list_mutex);
+                ida_free(&dma_ida, device->dev_id);
                 kfree(idr_ref);
                 return rc;
         }
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
index ddb1e9365a3e..b93c558dd86e 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
@@ -51,51 +51,34 @@ static int vmw_gmrid_man_get_node(struct ttm_mem_type_manager *man,
 {
         struct vmwgfx_gmrid_man *gman =
                 (struct vmwgfx_gmrid_man *)man->priv;
-        int ret = 0;
         int id;
 
         mem->mm_node = NULL;
 
+        id = ida_alloc_max(&gman->gmr_ida, gman->max_gmr_ids - 1, GFP_KERNEL);
+        if (id < 0)
+                return id;
+
         spin_lock(&gman->lock);
 
         if (gman->max_gmr_pages > 0) {
                 gman->used_gmr_pages += bo->num_pages;
                 if (unlikely(gman->used_gmr_pages > gman->max_gmr_pages))
-                        goto out_err_locked;
+                        goto nospace;
         }
 
-        do {
-                spin_unlock(&gman->lock);
-                if (unlikely(ida_pre_get(&gman->gmr_ida, GFP_KERNEL) == 0)) {
-                        ret = -ENOMEM;
-                        goto out_err;
-                }
-                spin_lock(&gman->lock);
-
-                ret = ida_get_new(&gman->gmr_ida, &id);
-                if (unlikely(ret == 0 && id >= gman->max_gmr_ids)) {
-                        ida_remove(&gman->gmr_ida, id);
-                        ret = 0;
-                        goto out_err_locked;
-                }
-        } while (ret == -EAGAIN);
-
-        if (likely(ret == 0)) {
-                mem->mm_node = gman;
-                mem->start = id;
-                mem->num_pages = bo->num_pages;
-        } else
-                goto out_err_locked;
+        mem->mm_node = gman;
+        mem->start = id;
+        mem->num_pages = bo->num_pages;
 
         spin_unlock(&gman->lock);
         return 0;
 
-out_err:
-        spin_lock(&gman->lock);
-out_err_locked:
+nospace:
         gman->used_gmr_pages -= bo->num_pages;
         spin_unlock(&gman->lock);
-        return ret;
+        ida_free(&gman->gmr_ida, id);
+        return 0;
 }
 
 static void vmw_gmrid_man_put_node(struct ttm_mem_type_manager *man,
@@ -105,8 +88,8 @@ static void vmw_gmrid_man_put_node(struct ttm_mem_type_manager *man,
                 (struct vmwgfx_gmrid_man *)man->priv;
 
         if (mem->mm_node) {
+                ida_free(&gman->gmr_ida, mem->start);
                 spin_lock(&gman->lock);
-                ida_remove(&gman->gmr_ida, mem->start);
                 gman->used_gmr_pages -= mem->num_pages;
                 spin_unlock(&gman->lock);
                 mem->mm_node = NULL;
diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c
index fcdf3d5dc4b6..3bae24b15eaa 100644
--- a/drivers/media/media-device.c
+++ b/drivers/media/media-device.c
@@ -585,18 +585,12 @@ int __must_check media_device_register_entity(struct media_device *mdev,
         entity->num_links = 0;
         entity->num_backlinks = 0;
 
-        if (!ida_pre_get(&mdev->entity_internal_idx, GFP_KERNEL))
-                return -ENOMEM;
-
-        mutex_lock(&mdev->graph_mutex);
-
-        ret = ida_get_new_above(&mdev->entity_internal_idx, 1,
-                                &entity->internal_idx);
-        if (ret < 0) {
-                mutex_unlock(&mdev->graph_mutex);
+        ret = ida_alloc_min(&mdev->entity_internal_idx, 1, GFP_KERNEL);
+        if (ret < 0)
                 return ret;
-        }
+        entity->internal_idx = ret;
 
+        mutex_lock(&mdev->graph_mutex);
         mdev->entity_internal_idx_max =
                 max(mdev->entity_internal_idx_max, entity->internal_idx);
 
@@ -642,7 +636,7 @@ static void __media_device_unregister_entity(struct media_entity *entity)
         struct media_interface *intf;
         unsigned int i;
 
-        ida_simple_remove(&mdev->entity_internal_idx, entity->internal_idx);
+        ida_free(&mdev->entity_internal_idx, entity->internal_idx);
 
         /* Remove all interface links pointing to this entity */
         list_for_each_entry(intf, &mdev->interfaces, graph_obj.list) {
diff --git a/drivers/misc/cb710/core.c b/drivers/misc/cb710/core.c
index 4d4acf763b65..2c43fd09d602 100644
--- a/drivers/misc/cb710/core.c
+++ b/drivers/misc/cb710/core.c
@@ -16,7 +16,6 @@
 #include <linux/gfp.h>
 
 static DEFINE_IDA(cb710_ida);
-static DEFINE_SPINLOCK(cb710_ida_lock);
 
 void cb710_pci_update_config_reg(struct pci_dev *pdev,
         int reg, uint32_t mask, uint32_t xor)
@@ -205,7 +204,6 @@ static int cb710_probe(struct pci_dev *pdev,
         const struct pci_device_id *ent)
 {
         struct cb710_chip *chip;
-        unsigned long flags;
         u32 val;
         int err;
         int n = 0;
@@ -256,18 +254,10 @@ static int cb710_probe(struct pci_dev *pdev,
         if (err)
                 return err;
 
-        do {
-                if (!ida_pre_get(&cb710_ida, GFP_KERNEL))
-                        return -ENOMEM;
-
-                spin_lock_irqsave(&cb710_ida_lock, flags);
-                err = ida_get_new(&cb710_ida, &chip->platform_id);
-                spin_unlock_irqrestore(&cb710_ida_lock, flags);
-
-                if (err && err != -EAGAIN)
-                        return err;
-        } while (err);
-
+        err = ida_alloc(&cb710_ida, GFP_KERNEL);
+        if (err < 0)
+                return err;
+        chip->platform_id = err;
 
         dev_info(&pdev->dev, "id %d, IO 0x%p, IRQ %d\n",
                 chip->platform_id, chip->iobase, pdev->irq);
@@ -308,7 +298,6 @@ unreg_mmc:
 static void cb710_remove_one(struct pci_dev *pdev)
 {
         struct cb710_chip *chip = pci_get_drvdata(pdev);
-        unsigned long flags;
 
         cb710_unregister_slot(chip, CB710_SLOT_SM);
         cb710_unregister_slot(chip, CB710_SLOT_MS);
@@ -317,9 +306,7 @@ static void cb710_remove_one(struct pci_dev *pdev)
         BUG_ON(atomic_read(&chip->slot_refs_count) != 0);
 #endif
 
-        spin_lock_irqsave(&cb710_ida_lock, flags);
-        ida_remove(&cb710_ida, chip->platform_id);
-        spin_unlock_irqrestore(&cb710_ida_lock, flags);
+        ida_free(&cb710_ida, chip->platform_id);
 }
 
 static const struct pci_device_id cb710_pci_tbl[] = {
diff --git a/drivers/scsi/osd/osd_uld.c b/drivers/scsi/osd/osd_uld.c
index 0e56f1eb05dc..eaf36ccf58db 100644
--- a/drivers/scsi/osd/osd_uld.c
+++ b/drivers/scsi/osd/osd_uld.c
@@ -423,19 +423,11 @@ static int osd_probe(struct device *dev)
         if (scsi_device->type != TYPE_OSD)
                 return -ENODEV;
 
-        do {
-                if (!ida_pre_get(&osd_minor_ida, GFP_KERNEL))
-                        return -ENODEV;
-
-                error = ida_get_new(&osd_minor_ida, &minor);
-        } while (error == -EAGAIN);
-
-        if (error)
-                return error;
-        if (minor >= SCSI_OSD_MAX_MINOR) {
-                error = -EBUSY;
-                goto err_retract_minor;
-        }
+        minor = ida_alloc_max(&osd_minor_ida, SCSI_OSD_MAX_MINOR, GFP_KERNEL);
+        if (minor == -ENOSPC)
+                return -EBUSY;
+        if (minor < 0)
+                return -ENODEV;
 
         error = -ENOMEM;
         oud = kzalloc(sizeof(*oud), GFP_KERNEL);
@@ -499,7 +491,7 @@ static int osd_probe(struct device *dev)
 err_free_osd:
         put_device(&oud->class_dev);
 err_retract_minor:
-        ida_remove(&osd_minor_ida, minor);
+        ida_free(&osd_minor_ida, minor);
         return error;
 }
 
@@ -514,7 +506,7 @@ static int osd_remove(struct device *dev)
         }
 
         cdev_device_del(&oud->cdev, &oud->class_dev);
-        ida_remove(&osd_minor_ida, oud->minor);
+        ida_free(&osd_minor_ida, oud->minor);
         put_device(&oud->class_dev);
 
         return 0;
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index a58cee7a85f2..b79b366a94f7 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -123,7 +123,6 @@ static void scsi_disk_release(struct device *cdev);
 static void sd_print_sense_hdr(struct scsi_disk *, struct scsi_sense_hdr *);
 static void sd_print_result(const struct scsi_disk *, const char *, int);
 
-static DEFINE_SPINLOCK(sd_index_lock);
 static DEFINE_IDA(sd_index_ida);
 
 /* This semaphore is used to mediate the 0->1 reference get in the
@@ -3340,16 +3339,8 @@ static int sd_probe(struct device *dev)
         if (!gd)
                 goto out_free;
 
-        do {
-                if (!ida_pre_get(&sd_index_ida, GFP_KERNEL))
-                        goto out_put;
-
-                spin_lock(&sd_index_lock);
-                error = ida_get_new(&sd_index_ida, &index);
-                spin_unlock(&sd_index_lock);
-        } while (error == -EAGAIN);
-
-        if (error) {
+        index = ida_alloc(&sd_index_ida, GFP_KERNEL);
+        if (index < 0) {
                 sdev_printk(KERN_WARNING, sdp, "sd_probe: memory exhausted.\n");
                 goto out_put;
         }
@@ -3393,9 +3384,7 @@ static int sd_probe(struct device *dev)
         return 0;
 
  out_free_index:
-        spin_lock(&sd_index_lock);
-        ida_remove(&sd_index_ida, index);
-        spin_unlock(&sd_index_lock);
+        ida_free(&sd_index_ida, index);
  out_put:
         put_disk(gd);
  out_free:
@@ -3460,9 +3449,7 @@ static void scsi_disk_release(struct device *dev)
         struct scsi_disk *sdkp = to_scsi_disk(dev);
         struct gendisk *disk = sdkp->disk;
         
-        spin_lock(&sd_index_lock);
-        ida_remove(&sd_index_ida, sdkp->index);
-        spin_unlock(&sd_index_lock);
+        ida_free(&sd_index_ida, sdkp->index);
 
         disk->private_data = NULL;
         put_disk(disk);
diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
index 8e223799347a..94bad43c41ff 100644
--- a/drivers/target/iscsi/iscsi_target.c
+++ b/drivers/target/iscsi/iscsi_target.c
@@ -57,9 +57,8 @@ static DEFINE_SPINLOCK(tiqn_lock);
 static DEFINE_MUTEX(np_lock);
 
 static struct idr tiqn_idr;
-struct idr sess_idr;
+DEFINE_IDA(sess_ida);
 struct mutex auth_id_lock;
-spinlock_t sess_idr_lock;
 
 struct iscsit_global *iscsit_global;
 
@@ -700,9 +699,7 @@ static int __init iscsi_target_init_module(void)
 
         spin_lock_init(&iscsit_global->ts_bitmap_lock);
         mutex_init(&auth_id_lock);
-        spin_lock_init(&sess_idr_lock);
         idr_init(&tiqn_idr);
-        idr_init(&sess_idr);
 
         ret = target_register_template(&iscsi_ops);
         if (ret)
@@ -4375,10 +4372,7 @@ int iscsit_close_session(struct iscsi_session *sess)
         pr_debug("Decremented number of active iSCSI Sessions on"
                 " iSCSI TPG: %hu to %u\n", tpg->tpgt, tpg->nsessions);
 
-        spin_lock(&sess_idr_lock);
-        idr_remove(&sess_idr, sess->session_index);
-        spin_unlock(&sess_idr_lock);
-
+        ida_free(&sess_ida, sess->session_index);
         kfree(sess->sess_ops);
         sess->sess_ops = NULL;
         spin_unlock_bh(&se_tpg->session_lock);
diff --git a/drivers/target/iscsi/iscsi_target.h b/drivers/target/iscsi/iscsi_target.h
index 42de1843aa40..48bac0acf8c7 100644
--- a/drivers/target/iscsi/iscsi_target.h
+++ b/drivers/target/iscsi/iscsi_target.h
@@ -55,9 +55,7 @@ extern struct kmem_cache *lio_ooo_cache;
 extern struct kmem_cache *lio_qr_cache;
 extern struct kmem_cache *lio_r2t_cache;
 
-extern struct idr sess_idr;
+extern struct ida sess_ida;
 extern struct mutex auth_id_lock;
-extern spinlock_t sess_idr_lock;
-
 
 #endif   /*** ISCSI_TARGET_H ***/
diff --git a/drivers/target/iscsi/iscsi_target_login.c b/drivers/target/iscsi/iscsi_target_login.c
index 923b1a9fc3dc..9e74f8bc2963 100644
--- a/drivers/target/iscsi/iscsi_target_login.c
+++ b/drivers/target/iscsi/iscsi_target_login.c
@@ -336,22 +336,15 @@ static int iscsi_login_zero_tsih_s1(
         timer_setup(&sess->time2retain_timer,
                     iscsit_handle_time2retain_timeout, 0);
 
-        idr_preload(GFP_KERNEL);
-        spin_lock_bh(&sess_idr_lock);
-        ret = idr_alloc(&sess_idr, NULL, 0, 0, GFP_NOWAIT);
-        if (ret >= 0)
-                sess->session_index = ret;
-        spin_unlock_bh(&sess_idr_lock);
-        idr_preload_end();
-
+        ret = ida_alloc(&sess_ida, GFP_KERNEL);
         if (ret < 0) {
-                pr_err("idr_alloc() for sess_idr failed\n");
+                pr_err("Session ID allocation failed %d\n", ret);
                 iscsit_tx_login_rsp(conn, ISCSI_STATUS_CLS_TARGET_ERR,
                                 ISCSI_LOGIN_STATUS_NO_RESOURCES);
-                kfree(sess);
-                return -ENOMEM;
+                goto free_sess;
         }
 
+        sess->session_index = ret;
         sess->creation_time = get_jiffies_64();
         /*
          * The FFP CmdSN window values will be allocated from the TPG's
@@ -365,20 +358,26 @@ static int iscsi_login_zero_tsih_s1(
                                 ISCSI_LOGIN_STATUS_NO_RESOURCES);
                 pr_err("Unable to allocate memory for"
                                 " struct iscsi_sess_ops.\n");
-                kfree(sess);
-                return -ENOMEM;
+                goto free_id;
         }
 
         sess->se_sess = transport_alloc_session(TARGET_PROT_NORMAL);
         if (IS_ERR(sess->se_sess)) {
                 iscsit_tx_login_rsp(conn, ISCSI_STATUS_CLS_TARGET_ERR,
                                 ISCSI_LOGIN_STATUS_NO_RESOURCES);
-                kfree(sess->sess_ops);
-                kfree(sess);
-                return -ENOMEM;
+                goto free_ops;
         }
 
         return 0;
+
+free_ops:
+        kfree(sess->sess_ops);
+free_id:
+        ida_free(&sess_ida, sess->session_index);
+free_sess:
+        kfree(sess);
+        conn->sess = NULL;
+        return -ENOMEM;
 }
 
 static int iscsi_login_zero_tsih_s2(
@@ -1161,13 +1160,9 @@ void iscsi_target_login_sess_out(struct iscsi_conn *conn,
                                    ISCSI_LOGIN_STATUS_INIT_ERR);
         if (!zero_tsih || !conn->sess)
                 goto old_sess_out;
-        if (conn->sess->se_sess)
-                transport_free_session(conn->sess->se_sess);
-        if (conn->sess->session_index != 0) {
-                spin_lock_bh(&sess_idr_lock);
-                idr_remove(&sess_idr, conn->sess->session_index);
-                spin_unlock_bh(&sess_idr_lock);
-        }
+
+        transport_free_session(conn->sess->se_sess);
+        ida_free(&sess_ida, conn->sess->session_index);
         kfree(conn->sess->sess_ops);
         kfree(conn->sess);
         conn->sess = NULL;