Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
LU-14733 o2iblnd: Move racy NULL assignment
[fs/lustre-release.git]
/
lnet
/
klnds
/
o2iblnd
/
o2iblnd.c
diff --git
a/lnet/klnds/o2iblnd/o2iblnd.c
b/lnet/klnds/o2iblnd/o2iblnd.c
index
82b8d10
..
f3028b4
100644
(file)
--- a/
lnet/klnds/o2iblnd/o2iblnd.c
+++ b/
lnet/klnds/o2iblnd/o2iblnd.c
@@
-525,7
+525,6
@@
kiblnd_get_conn_by_idx(struct lnet_ni *ni, int index)
{
struct kib_peer_ni *peer_ni;
struct kib_conn *conn;
- struct list_head *ctmp;
int i;
unsigned long flags;
@@
-537,11
+536,11
@@
kiblnd_get_conn_by_idx(struct lnet_ni *ni, int index)
if (peer_ni->ibp_ni != ni)
continue;
- list_for_each(ctmp, &peer_ni->ibp_conns) {
+ list_for_each_entry(conn, &peer_ni->ibp_conns,
+ ibc_list) {
if (index-- > 0)
continue;
- conn = list_entry(ctmp, struct kib_conn, ibc_list);
kiblnd_conn_addref(conn);
read_unlock_irqrestore(&kiblnd_data.kib_global_lock,
flags);
@@
-1752,10
+1751,10
@@
kiblnd_fmr_pool_unmap(struct kib_fmr *fmr, int status)
if (frd) {
frd->frd_valid = false;
+ fmr->fmr_frd = NULL;
spin_lock(&fps->fps_lock);
list_add_tail(&frd->frd_list, &fpo->fast_reg.fpo_pool_list);
spin_unlock(&fps->fps_lock);
- fmr->fmr_frd = NULL;
}
}
fmr->fmr_pool = NULL;