diff options
| author |   Matan Barak <matanb@mellanox.com> | 2017-04-18 12:03:41 +0300 |
|---|---|---|
| committer |   Doug Ledford <dledford@redhat.com> | 2017-04-20 11:44:07 -0400 |
| commit | e0fcc61113c17a2eae0dea7e9e67ac71849475b5 (patch) | |
| tree | 4bf9298d8620acdba7481efffff504e8c5e03aac /drivers | |
| parent | IB/core: A small refactor in destroy WQ handler (diff) | |
| download | linux-dev-e0fcc61113c17a2eae0dea7e9e67ac71849475b5.tar.xz linux-dev-e0fcc61113c17a2eae0dea7e9e67ac71849475b5.zip | |
IB/core: Don't use is_async in event files to infer events size
Previously, we inferred the events size in ib_uverbs_event_read by
using the is_async flag. Instead of that, we pass the event size
directly.
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')
| -rw-r--r-- | drivers/infiniband/core/uverbs_main.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c index 0b0dab89106a..4ab0e5d3ce15 100644 --- a/drivers/infiniband/core/uverbs_main.c +++ b/drivers/infiniband/core/uverbs_main.c @@ -257,10 +257,9 @@ static ssize_t ib_uverbs_event_read(struct ib_uverbs_event_file *file, struct ib_uverbs_file *uverbs_file, struct file *filp, char __user *buf, size_t count, loff_t *pos, - bool is_async) + size_t eventsz) { struct ib_uverbs_event *event; - int eventsz; int ret = 0; spin_lock_irq(&file->lock); @@ -290,11 +289,6 @@ static ssize_t ib_uverbs_event_read(struct ib_uverbs_event_file *file, event = list_entry(file->event_list.next, struct ib_uverbs_event, list); - if (is_async) - eventsz = sizeof (struct ib_uverbs_async_event_desc); - else - eventsz = sizeof (struct ib_uverbs_comp_event_desc); - if (eventsz > count) { ret = -EINVAL; event = NULL; @@ -326,7 +320,8 @@ static ssize_t ib_uverbs_async_event_read(struct file *filp, char __user *buf, struct ib_uverbs_async_event_file *file = filp->private_data; return ib_uverbs_event_read(&file->ev_file, file->uverbs_file, filp, - buf, count, pos, true); + buf, count, pos, + sizeof(struct ib_uverbs_async_event_desc)); } static ssize_t ib_uverbs_comp_event_read(struct file *filp, char __user *buf, @@ -337,7 +332,8 @@ static ssize_t ib_uverbs_comp_event_read(struct file *filp, char __user *buf, return ib_uverbs_event_read(&comp_ev_file->ev_file, comp_ev_file->uobj_file.ufile, filp, - buf, count, pos, false); + buf, count, pos, + sizeof(struct ib_uverbs_comp_event_desc)); } static unsigned int ib_uverbs_event_poll(struct ib_uverbs_event_file *file, |