|
@@ -1296,7 +1296,6 @@ ssize_t ib_uverbs_destroy_cq(struct ib_uverbs_file *file,
|
|
struct ib_uobject *uobj;
|
|
struct ib_uobject *uobj;
|
|
struct ib_cq *cq;
|
|
struct ib_cq *cq;
|
|
struct ib_ucq_object *obj;
|
|
struct ib_ucq_object *obj;
|
|
- struct ib_uverbs_event_queue *ev_queue;
|
|
|
|
int ret = -EINVAL;
|
|
int ret = -EINVAL;
|
|
|
|
|
|
if (copy_from_user(&cmd, buf, sizeof cmd))
|
|
if (copy_from_user(&cmd, buf, sizeof cmd))
|
|
@@ -1313,7 +1312,6 @@ ssize_t ib_uverbs_destroy_cq(struct ib_uverbs_file *file,
|
|
*/
|
|
*/
|
|
uverbs_uobject_get(uobj);
|
|
uverbs_uobject_get(uobj);
|
|
cq = uobj->object;
|
|
cq = uobj->object;
|
|
- ev_queue = cq->cq_context;
|
|
|
|
obj = container_of(cq->uobject, struct ib_ucq_object, uobject);
|
|
obj = container_of(cq->uobject, struct ib_ucq_object, uobject);
|
|
|
|
|
|
memset(&resp, 0, sizeof(resp));
|
|
memset(&resp, 0, sizeof(resp));
|
|
@@ -2088,7 +2086,6 @@ ssize_t ib_uverbs_destroy_qp(struct ib_uverbs_file *file,
|
|
struct ib_uverbs_destroy_qp cmd;
|
|
struct ib_uverbs_destroy_qp cmd;
|
|
struct ib_uverbs_destroy_qp_resp resp;
|
|
struct ib_uverbs_destroy_qp_resp resp;
|
|
struct ib_uobject *uobj;
|
|
struct ib_uobject *uobj;
|
|
- struct ib_qp *qp;
|
|
|
|
struct ib_uqp_object *obj;
|
|
struct ib_uqp_object *obj;
|
|
int ret = -EINVAL;
|
|
int ret = -EINVAL;
|
|
|
|
|
|
@@ -2102,7 +2099,6 @@ ssize_t ib_uverbs_destroy_qp(struct ib_uverbs_file *file,
|
|
if (IS_ERR(uobj))
|
|
if (IS_ERR(uobj))
|
|
return PTR_ERR(uobj);
|
|
return PTR_ERR(uobj);
|
|
|
|
|
|
- qp = uobj->object;
|
|
|
|
obj = container_of(uobj, struct ib_uqp_object, uevent.uobject);
|
|
obj = container_of(uobj, struct ib_uqp_object, uevent.uobject);
|
|
/*
|
|
/*
|
|
* Make sure we don't free the memory in remove_commit as we still
|
|
* Make sure we don't free the memory in remove_commit as we still
|
|
@@ -3004,7 +3000,6 @@ int ib_uverbs_ex_destroy_wq(struct ib_uverbs_file *file,
|
|
{
|
|
{
|
|
struct ib_uverbs_ex_destroy_wq cmd = {};
|
|
struct ib_uverbs_ex_destroy_wq cmd = {};
|
|
struct ib_uverbs_ex_destroy_wq_resp resp = {};
|
|
struct ib_uverbs_ex_destroy_wq_resp resp = {};
|
|
- struct ib_wq *wq;
|
|
|
|
struct ib_uobject *uobj;
|
|
struct ib_uobject *uobj;
|
|
struct ib_uwq_object *obj;
|
|
struct ib_uwq_object *obj;
|
|
size_t required_cmd_sz;
|
|
size_t required_cmd_sz;
|
|
@@ -3038,7 +3033,6 @@ int ib_uverbs_ex_destroy_wq(struct ib_uverbs_file *file,
|
|
if (IS_ERR(uobj))
|
|
if (IS_ERR(uobj))
|
|
return PTR_ERR(uobj);
|
|
return PTR_ERR(uobj);
|
|
|
|
|
|
- wq = uobj->object;
|
|
|
|
obj = container_of(uobj, struct ib_uwq_object, uevent.uobject);
|
|
obj = container_of(uobj, struct ib_uwq_object, uevent.uobject);
|
|
/*
|
|
/*
|
|
* Make sure we don't free the memory in remove_commit as we still
|
|
* Make sure we don't free the memory in remove_commit as we still
|
|
@@ -3728,10 +3722,8 @@ ssize_t ib_uverbs_destroy_srq(struct ib_uverbs_file *file,
|
|
struct ib_uverbs_destroy_srq cmd;
|
|
struct ib_uverbs_destroy_srq cmd;
|
|
struct ib_uverbs_destroy_srq_resp resp;
|
|
struct ib_uverbs_destroy_srq_resp resp;
|
|
struct ib_uobject *uobj;
|
|
struct ib_uobject *uobj;
|
|
- struct ib_srq *srq;
|
|
|
|
struct ib_uevent_object *obj;
|
|
struct ib_uevent_object *obj;
|
|
int ret = -EINVAL;
|
|
int ret = -EINVAL;
|
|
- enum ib_srq_type srq_type;
|
|
|
|
|
|
|
|
if (copy_from_user(&cmd, buf, sizeof cmd))
|
|
if (copy_from_user(&cmd, buf, sizeof cmd))
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
@@ -3741,9 +3733,7 @@ ssize_t ib_uverbs_destroy_srq(struct ib_uverbs_file *file,
|
|
if (IS_ERR(uobj))
|
|
if (IS_ERR(uobj))
|
|
return PTR_ERR(uobj);
|
|
return PTR_ERR(uobj);
|
|
|
|
|
|
- srq = uobj->object;
|
|
|
|
obj = container_of(uobj, struct ib_uevent_object, uobject);
|
|
obj = container_of(uobj, struct ib_uevent_object, uobject);
|
|
- srq_type = srq->srq_type;
|
|
|
|
/*
|
|
/*
|
|
* Make sure we don't free the memory in remove_commit as we still
|
|
* Make sure we don't free the memory in remove_commit as we still
|
|
* needs the uobject memory to create the response.
|
|
* needs the uobject memory to create the response.
|