On Tue, May 04, 2021 at 03:32:53PM +0200, Fabio M. De Francesco wrote: > Changes from v6; Added a call to xa_destroy() that I had forgotten. What? No! Go back and re-read what I wrote about this previously. > +static int setup_scsitaskmgmt_handles(struct xarray *xa, struct uiscmdrsp *cmdrsp, > wait_queue_head_t *event, int *result) > { > - /* specify the event that has to be triggered when this */ > - /* cmd is complete */ > - cmdrsp->scsitaskmgmt.notify_handle = > - simple_idr_get(idrtable, event, lock); > - cmdrsp->scsitaskmgmt.notifyresult_handle = > - simple_idr_get(idrtable, result, lock); > + int ret; > + u32 id; > + > + /* specify the event that has to be triggered when this cmd is complete */ > + ret = xa_alloc_irq(xa, &id, event, xa_limit_32b, GFP_KERNEL); > + if (ret) > + return ret; > + else > + cmdrsp->scsitaskmgmt.notify_handle = id; This 'else' is actively confusing. > + ret = xa_alloc_irq(xa, &id, result, xa_limit_32b, GFP_KERNEL); > + if (ret) { > + xa_erase_irq(xa, cmdrsp->scsitaskmgmt.notify_handle); > + return ret; > + } else > + cmdrsp->scsitaskmgmt.notifyresult_handle = id; Ditto.