aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
diff options
context:
space:
mode:
authorMatan Barak <matanb@mellanox.com>2017-04-18 12:03:40 +0300
committerDoug Ledford <dledford@redhat.com>2017-04-20 11:44:07 -0400
commitc52d8114d1a58f6fe4bfb9af39d262dd8f21e50e (patch)
tree802c0d4035592f9149b969936a0499d0af8f9f7f /drivers/infiniband
parentIB/core: Nullify ib_uobject during allocation (diff)
downloadlinux-dev-c52d8114d1a58f6fe4bfb9af39d262dd8f21e50e.tar.xz
linux-dev-c52d8114d1a58f6fe4bfb9af39d262dd8f21e50e.zip
IB/core: A small refactor in destroy WQ handler
Instead of having uverbs_uobject_put both in the error flow and the good flow, we unite them. Fixes: fd3c7904db6e ('IB/core: Change idr objects to use the new 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')
-rw-r--r--drivers/infiniband/core/uverbs_cmd.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
index b9024fa31b18..66cb22e82e24 100644
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -2989,18 +2989,12 @@ int ib_uverbs_ex_destroy_wq(struct ib_uverbs_file *file,
uverbs_uobject_get(uobj);
ret = uobj_remove_commit(uobj);
- if (ret) {
- uverbs_uobject_put(uobj);
- return ret;
- }
-
resp.events_reported = obj->uevent.events_reported;
uverbs_uobject_put(uobj);
- ret = ib_copy_to_udata(ucore, &resp, resp.response_length);
if (ret)
return ret;
- return 0;
+ return ib_copy_to_udata(ucore, &resp, resp.response_length);
}
int ib_uverbs_ex_modify_wq(struct ib_uverbs_file *file,