|
@@ -1,5 +1,5 @@
|
|
|
/*
|
|
|
- * Copyright(c) 2015-2017 Intel Corporation.
|
|
|
+ * Copyright(c) 2015-2018 Intel Corporation.
|
|
|
*
|
|
|
* This file is provided under a dual BSD/GPLv2 license. When using or
|
|
|
* redistributing this file, you may do so under either license.
|
|
@@ -375,7 +375,7 @@ int hfi1_user_exp_rcv_setup(struct hfi1_filedata *fd,
|
|
|
* From this point on, we are going to be using shared (between master
|
|
|
* and subcontexts) context resources. We need to take the lock.
|
|
|
*/
|
|
|
- mutex_lock(&uctxt->exp_lock);
|
|
|
+ mutex_lock(&uctxt->exp_mutex);
|
|
|
/*
|
|
|
* The first step is to program the RcvArray entries which are complete
|
|
|
* groups.
|
|
@@ -461,7 +461,7 @@ int hfi1_user_exp_rcv_setup(struct hfi1_filedata *fd,
|
|
|
}
|
|
|
}
|
|
|
unlock:
|
|
|
- mutex_unlock(&uctxt->exp_lock);
|
|
|
+ mutex_unlock(&uctxt->exp_mutex);
|
|
|
nomem:
|
|
|
hfi1_cdbg(TID, "total mapped: tidpairs:%u pages:%u (%d)", tididx,
|
|
|
mapped_pages, ret);
|
|
@@ -517,7 +517,7 @@ int hfi1_user_exp_rcv_clear(struct hfi1_filedata *fd,
|
|
|
if (IS_ERR(tidinfo))
|
|
|
return PTR_ERR(tidinfo);
|
|
|
|
|
|
- mutex_lock(&uctxt->exp_lock);
|
|
|
+ mutex_lock(&uctxt->exp_mutex);
|
|
|
for (tididx = 0; tididx < tinfo->tidcnt; tididx++) {
|
|
|
ret = unprogram_rcvarray(fd, tidinfo[tididx], NULL);
|
|
|
if (ret) {
|
|
@@ -530,7 +530,7 @@ int hfi1_user_exp_rcv_clear(struct hfi1_filedata *fd,
|
|
|
fd->tid_used -= tididx;
|
|
|
spin_unlock(&fd->tid_lock);
|
|
|
tinfo->tidcnt = tididx;
|
|
|
- mutex_unlock(&uctxt->exp_lock);
|
|
|
+ mutex_unlock(&uctxt->exp_mutex);
|
|
|
|
|
|
kfree(tidinfo);
|
|
|
return ret;
|