diff options
| author |   Jason Gunthorpe <jgg@ziepe.ca> | 2018-07-26 15:57:56 -0600 |
|---|---|---|
| committer |   Jason Gunthorpe <jgg@mellanox.com> | 2018-08-01 14:55:37 -0600 |
| commit | aa72c9a5f986444f5e245767402ed1f3066fca2c (patch) | |
| tree | 0654aa90c396feea48cc5895d554c181c3226178 /drivers/infiniband/core/uverbs_std_types_cq.c | |
| parent | RDMA: Fix return code check in rdma_set_cq_moderation (diff) | |
| download | linux-dev-aa72c9a5f986444f5e245767402ed1f3066fca2c.tar.xz linux-dev-aa72c9a5f986444f5e245767402ed1f3066fca2c.zip | |
IB/uverbs: Remove rdma_explicit_destroy() from the ioctl methods
The core code will destroy the HW object on behalf of the method, if the
method provides an implementation it must simply copy data from the stub
uobj into the response. Destroy methods cannot touch the HW object.
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/infiniband/core/uverbs_std_types_cq.c | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/drivers/infiniband/core/uverbs_std_types_cq.c b/drivers/infiniband/core/uverbs_std_types_cq.c index 3179203a2dd7..68c86e6e932e 100644 --- a/drivers/infiniband/core/uverbs_std_types_cq.c +++ b/drivers/infiniband/core/uverbs_std_types_cq.c @@ -179,21 +179,12 @@ static int UVERBS_HANDLER(UVERBS_METHOD_CQ_DESTROY)(struct ib_device *ib_dev, { struct ib_uobject *uobj = uverbs_attr_get_uobject(attrs, UVERBS_ATTR_DESTROY_CQ_HANDLE); - struct ib_uverbs_destroy_cq_resp resp; - struct ib_ucq_object *obj; - int ret; - - if (IS_ERR(uobj)) - return PTR_ERR(uobj); - - obj = container_of(uobj, struct ib_ucq_object, uobject); - - ret = rdma_explicit_destroy(uobj); - if (ret) - return ret; - - resp.comp_events_reported = obj->comp_events_reported; - resp.async_events_reported = obj->async_events_reported; + struct ib_ucq_object *obj = + container_of(uobj, struct ib_ucq_object, uobject); + struct ib_uverbs_destroy_cq_resp resp = { + .comp_events_reported = obj->comp_events_reported, + .async_events_reported = obj->async_events_reported + }; return uverbs_copy_to(attrs, UVERBS_ATTR_DESTROY_CQ_RESP, &resp, sizeof(resp)); |