git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'work.misc' and 'work.dcache' of git://git.kernel.org/pub/scm/linux...
[sfrench/cifs-2.6.git]
/
drivers
/
infiniband
/
core
/
rdma_core.c
diff --git
a/drivers/infiniband/core/rdma_core.c
b/drivers/infiniband/core/rdma_core.c
index a6e904973ba8a08973340b66f608eadfa04e2893..475910ffbcb6800f2e729f012b795483cbcc5c15 100644
(file)
--- a/
drivers/infiniband/core/rdma_core.c
+++ b/
drivers/infiniband/core/rdma_core.c
@@
-121,7
+121,7
@@
static int uverbs_try_lock_object(struct ib_uobject *uobj, bool exclusive)
* this lock.
*/
if (!exclusive)
- return
__atomic
_add_unless(&uobj->usecnt, 1, -1) == -1 ?
+ return
atomic_fetch
_add_unless(&uobj->usecnt, 1, -1) == -1 ?
-EBUSY : 0;
/* lock is either WRITE or DESTROY - should be exclusive */