system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-24 13:31:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

IB/srp: Remove !ch->target tests from the reconnect code

Browse source 
Remove the !ch->target tests from the reconnect code. These
tests are not needed: upon entry of srp_rport_reconnect()
it is guaranteed that all ch->target pointers are non-NULL.
None of the functions srp_new_cm_id(), srp_finish_req(),
srp_create_ch_ib() nor srp_connect_ch() modifies this pointer.
srp_free_ch_ib() is never called concurrently with
srp_rport_reconnect().

Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: Sagi Grimberg <sagig@mellanox.com>
Cc: Sebastian Parschauer <sebastian.riemer@profitbricks.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
This commit is contained in:
Bart Van Assche 2015-05-18 13:26:17 +02:00 committed by Doug Ledford
parent 47513cf4f4
commit bbac5ccff4
1 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/infiniband/ulp/srp/ib_srp.c
View file

@ -1210,14 +1210,10 @@ static int srp_rport_reconnect(struct srp_rport *rport)
*/ */
for (i = 0; i < target->ch_count; i++) { for (i = 0; i < target->ch_count; i++) {
ch = &target->ch[i]; ch = &target->ch[i];
if (!ch->target)
break;
ret += srp_new_cm_id(ch); ret += srp_new_cm_id(ch);
} }
for (i = 0; i < target->ch_count; i++) { for (i = 0; i < target->ch_count; i++) {
ch = &target->ch[i]; ch = &target->ch[i];
if (!ch->target)
break;
for (j = 0; j < target->req_ring_size; ++j) { for (j = 0; j < target->req_ring_size; ++j) {
struct srp_request *req = &ch->req_ring[j]; struct srp_request *req = &ch->req_ring[j];
@ -1226,8 +1222,6 @@ static int srp_rport_reconnect(struct srp_rport *rport)
} }
for (i = 0; i < target->ch_count; i++) { for (i = 0; i < target->ch_count; i++) {
ch = &target->ch[i]; ch = &target->ch[i];
if (!ch->target)
break;
/* /*
* Whether or not creating a new CM ID succeeded, create a new * Whether or not creating a new CM ID succeeded, create a new
* QP. This guarantees that all completion callback function * QP. This guarantees that all completion callback function
@ -1244,7 +1238,7 @@ static int srp_rport_reconnect(struct srp_rport *rport)
for (i = 0; i < target->ch_count; i++) { for (i = 0; i < target->ch_count; i++) {
ch = &target->ch[i]; ch = &target->ch[i];
if (ret || !ch->target) if (ret)
break; break;
ret = srp_connect_ch(ch, multich); ret = srp_connect_ch(ch, multich);
multich = true; multich = true;