diff options
| author |   Matan Barak <matanb@mellanox.com> | 2017-04-18 12:03:42 +0300 |
|---|---|---|
| committer |   Doug Ledford <dledford@redhat.com> | 2017-04-20 11:44:07 -0400 |
| commit | db1b5ddd53365a07a7754803bdba370ebb84ba19 (patch) | |
| tree | fa4c88e908e2cdc753857fa3112925befdd3b5dd /drivers/infiniband/core/uverbs_std_types.c | |
| parent | IB/core: Don't use is_async in event files to infer events size (diff) | |
| download | linux-dev-db1b5ddd53365a07a7754803bdba370ebb84ba19.tar.xz linux-dev-db1b5ddd53365a07a7754803bdba370ebb84ba19.zip | |
IB/core: Rename uverbs event file structure
Previously, ib_uverbs_event_file was suffixed by _file as it contained
the actual file information. Since it's now only used as base struct
for ib_uverbs_async_event_file and ib_uverbs_completion_event_file,
we change its name to ib_uverbs_event_queue. This represents its
logical role better.
Fixes: 1e7710f3f656 ('IB/core: Change completion channel to use the reworked objects schema')
Signed-off-by: Matan Barak <matanb@mellanox.com>
Reviewed-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/core/uverbs_std_types.c')
| -rw-r--r-- | drivers/infiniband/core/uverbs_std_types.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/infiniband/core/uverbs_std_types.c b/drivers/infiniband/core/uverbs_std_types.c index 7f26af5ea066..e3338b19d6a2 100644 --- a/drivers/infiniband/core/uverbs_std_types.c +++ b/drivers/infiniband/core/uverbs_std_types.c @@ -138,17 +138,17 @@ int uverbs_free_cq(struct ib_uobject *uobject, enum rdma_remove_reason why) { struct ib_cq *cq = uobject->object; - struct ib_uverbs_event_file *ev_file = cq->cq_context; + struct ib_uverbs_event_queue *ev_queue = cq->cq_context; struct ib_ucq_object *ucq = container_of(uobject, struct ib_ucq_object, uobject); int ret; ret = ib_destroy_cq(cq); if (!ret || why != RDMA_REMOVE_DESTROY) - ib_uverbs_release_ucq(uobject->context->ufile, ev_file ? - container_of(ev_file, + ib_uverbs_release_ucq(uobject->context->ufile, ev_queue ? + container_of(ev_queue, struct ib_uverbs_completion_event_file, - ev_file) : NULL, + ev_queue) : NULL, ucq); return ret; } @@ -196,15 +196,15 @@ int uverbs_hot_unplug_completion_event_file(struct ib_uobject_file *uobj_file, struct ib_uverbs_completion_event_file *comp_event_file = container_of(uobj_file, struct ib_uverbs_completion_event_file, uobj_file); - struct ib_uverbs_event_file *event_file = &comp_event_file->ev_file; + struct ib_uverbs_event_queue *event_queue = &comp_event_file->ev_queue; - spin_lock_irq(&event_file->lock); - event_file->is_closed = 1; - spin_unlock_irq(&event_file->lock); + spin_lock_irq(&event_queue->lock); + event_queue->is_closed = 1; + spin_unlock_irq(&event_queue->lock); if (why == RDMA_REMOVE_DRIVER_REMOVE) { - wake_up_interruptible(&event_file->poll_wait); - kill_fasync(&event_file->async_queue, SIGIO, POLL_IN); + wake_up_interruptible(&event_queue->poll_wait); + kill_fasync(&event_queue->async_queue, SIGIO, POLL_IN); } return 0; }; |