p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

IB/uverbs: Replace ib_ucq_object uverbs_file with the one in ib_uobject 

Now that ib_uobject has a ib_uverbs_file we don't need this extra one in
ib_ucq_object.

Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
This commit is contained in:
Jason Gunthorpe 2018-07-06 11:40:39 -06:00
parent d0259e82e7
commit 76bc79ccce
4 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/infiniband/core/uverbs.h
View File

@ -204,7 +204,6 @@ struct ib_uwq_object {
struct ib_ucq_object { struct ib_ucq_object {
struct ib_uobject uobject; struct ib_uobject uobject;
struct ib_uverbs_file *uverbs_file;
struct list_head comp_list; struct list_head comp_list;
struct list_head async_list; struct list_head async_list;
u32 comp_events_reported; u32 comp_events_reported;

1
drivers/infiniband/core/uverbs_cmd.c
View File

@ -976,7 +976,6 @@ static struct ib_ucq_object *create_cq(struct ib_uverbs_file *file,
} }
obj->uobject.user_handle = cmd->user_handle; obj->uobject.user_handle = cmd->user_handle;
obj->uverbs_file = file;
obj->comp_events_reported = 0; obj->comp_events_reported = 0;
obj->async_events_reported = 0; obj->async_events_reported = 0;
INIT_LIST_HEAD(&obj->comp_list); INIT_LIST_HEAD(&obj->comp_list);

2
drivers/infiniband/core/uverbs_main.c
View File

@ -538,7 +538,7 @@ void ib_uverbs_cq_event_handler(struct ib_event *event, void *context_ptr)
struct ib_ucq_object *uobj = container_of(event->element.cq->uobject, struct ib_ucq_object *uobj = container_of(event->element.cq->uobject,
struct ib_ucq_object, uobject); struct ib_ucq_object, uobject);
ib_uverbs_async_handler(uobj->uverbs_file, uobj->uobject.user_handle, ib_uverbs_async_handler(uobj->uobject.ufile, uobj->uobject.user_handle,
event->event, &uobj->async_list, event->event, &uobj->async_list,
&uobj->async_events_reported); &uobj->async_events_reported);
} }

1
drivers/infiniband/core/uverbs_std_types_cq.c
View File

@ -105,7 +105,6 @@ static int UVERBS_HANDLER(UVERBS_METHOD_CQ_CREATE)(struct ib_device *ib_dev,
obj = container_of(uverbs_attr_get_uobject(attrs, obj = container_of(uverbs_attr_get_uobject(attrs,
UVERBS_ATTR_CREATE_CQ_HANDLE), UVERBS_ATTR_CREATE_CQ_HANDLE),
typeof(*obj), uobject); typeof(*obj), uobject);
obj->uverbs_file = file;
obj->comp_events_reported = 0; obj->comp_events_reported = 0;
obj->async_events_reported = 0; obj->async_events_reported = 0;
INIT_LIST_HEAD(&obj->comp_list); INIT_LIST_HEAD(&obj->comp_list);