diff options
| author | Jens Axboe <axboe@fb.com> | 2016-09-13 07:58:34 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-09-13 07:58:34 -0600 |
| commit | 3bc42f3f0ef13a8239138a4c00a0b782f029f23d (patch) | |
| tree | d098779bb062ee740158ed4b41065172ef4aa81b /drivers/infiniband/hw/cxgb4/device.c | |
| parent | 015282c9eb6da05bfad6ff009078f91e06c0c98f (diff) | |
| parent | 2cfe199ca5a8816ee80fe15bcf202dd1020aaea0 (diff) | |
| download | linux-3bc42f3f0ef13a8239138a4c00a0b782f029f23d.tar.gz linux-3bc42f3f0ef13a8239138a4c00a0b782f029f23d.tar.bz2 linux-3bc42f3f0ef13a8239138a4c00a0b782f029f23d.zip | |
Merge branch 'nvmf-4.8-rc' of git://git.infradead.org/nvme-fabrics into for-linus
Sagi writes:
Here we have:
- Kconfig dependencies fix from Arnd
- nvme-rdma device removal fixes from Steve
- possible bad deref fix from Colin
Diffstat (limited to 'drivers/infiniband/hw/cxgb4/device.c')
| -rw-r--r-- | drivers/infiniband/hw/cxgb4/device.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/infiniband/hw/cxgb4/device.c b/drivers/infiniband/hw/cxgb4/device.c index 071d7332ec06..3c4b2126e0d1 100644 --- a/drivers/infiniband/hw/cxgb4/device.c +++ b/drivers/infiniband/hw/cxgb4/device.c @@ -872,9 +872,13 @@ static void c4iw_rdev_close(struct c4iw_rdev *rdev) static void c4iw_dealloc(struct uld_ctx *ctx) { c4iw_rdev_close(&ctx->dev->rdev); + WARN_ON_ONCE(!idr_is_empty(&ctx->dev->cqidr)); idr_destroy(&ctx->dev->cqidr); + WARN_ON_ONCE(!idr_is_empty(&ctx->dev->qpidr)); idr_destroy(&ctx->dev->qpidr); + WARN_ON_ONCE(!idr_is_empty(&ctx->dev->mmidr)); idr_destroy(&ctx->dev->mmidr); + wait_event(ctx->dev->wait, idr_is_empty(&ctx->dev->hwtid_idr)); idr_destroy(&ctx->dev->hwtid_idr); idr_destroy(&ctx->dev->stid_idr); idr_destroy(&ctx->dev->atid_idr); @@ -992,6 +996,7 @@ static struct c4iw_dev *c4iw_alloc(const struct cxgb4_lld_info *infop) mutex_init(&devp->rdev.stats.lock); mutex_init(&devp->db_mutex); INIT_LIST_HEAD(&devp->db_fc_list); + init_waitqueue_head(&devp->wait); devp->avail_ird = devp->rdev.lldi.max_ird_adapter; if (c4iw_debugfs_root) { |