[PATCH] ib: release locks in the proper order
From: Steven Rostedt
Date: Mon Sep 21 2009 - 15:23:46 EST
RT is very sensitive to the order locks are taken and released
wrt read write locks. We must do
lock(a);
lock(b);
lock(c);
[...]
unlock(c);
unlock(b);
unlock(a);
otherwise bad things can happen.
Signed-off-by: Ken Cox <jkc@xxxxxxxxxx>
Signed-off-by: Clark Williams <williams@xxxxxxxxxx>
Signed-off-by: John Kacur <jkacur@xxxxxxxxxx>
---
drivers/infiniband/core/uverbs_cmd.c | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
index 56feab6..5ea66e1 100644
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -1116,12 +1116,12 @@ ssize_t ib_uverbs_create_qp(struct ib_uverbs_file *file,
goto err_copy;
}
- put_pd_read(pd);
- put_cq_read(scq);
- if (rcq != scq)
- put_cq_read(rcq);
if (srq)
put_srq_read(srq);
+ if (rcq != scq)
+ put_cq_read(rcq);
+ put_cq_read(scq);
+ put_pd_read(pd);
mutex_lock(&file->mutex);
list_add_tail(&obj->uevent.uobject.list, &file->ucontext->qp_list);
@@ -1140,14 +1140,14 @@ err_destroy:
ib_destroy_qp(qp);
err_put:
- if (pd)
- put_pd_read(pd);
- if (scq)
- put_cq_read(scq);
- if (rcq && rcq != scq)
- put_cq_read(rcq);
if (srq)
put_srq_read(srq);
+ if (rcq && rcq != scq)
+ put_cq_read(rcq);
+ if (scq)
+ put_cq_read(scq);
+ if (pd)
+ put_pd_read(pd);
put_uobj_write(&obj->uevent.uobject);
return ret;
--
1.6.0.6
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/