On Fri, Sep 19, 2014 at 3:58 PM, Bart Van Assche <[email protected]> wrote: > Attempting to connect three times may be insufficient after an > initiator system that was using multiple RDMA channels tries to > relogin. Additionally, this login retry mechanism is a workaround > for particular behavior of the IB/CM.
Can you be more specific re the particular behavior of the IB CM? added Sean, the CM maintainer. > Since the srp_daemon retries > a failed login attempt anyway, remove the stale connection retry > mechanism. > > Signed-off-by: Bart Van Assche <[email protected]> > --- > drivers/infiniband/ulp/srp/ib_srp.c | 16 +++------------- > 1 file changed, 3 insertions(+), 13 deletions(-) > > diff --git a/drivers/infiniband/ulp/srp/ib_srp.c > b/drivers/infiniband/ulp/srp/ib_srp.c > index d3c712f..9608e7a 100644 > --- a/drivers/infiniband/ulp/srp/ib_srp.c > +++ b/drivers/infiniband/ulp/srp/ib_srp.c > @@ -904,7 +904,6 @@ static void srp_rport_delete(struct srp_rport *rport) > > static int srp_connect_target(struct srp_target_port *target) > { > - int retries = 3; > int ret; > > WARN_ON_ONCE(target->connected); > @@ -945,19 +944,10 @@ static int srp_connect_target(struct srp_target_port > *target) > break; > > case SRP_STALE_CONN: > - /* Our current CM id was stale, and is now in > timewait. > - * Try to reconnect with a new one. > - */ > - if (!retries-- || srp_new_cm_id(target)) { > - shost_printk(KERN_ERR, target->scsi_host, PFX > - "giving up on stale > connection\n"); > - target->status = -ECONNRESET; > - return target->status; > - } > - > shost_printk(KERN_ERR, target->scsi_host, PFX > - "retrying stale connection\n"); > - break; > + "giving up on stale connection\n"); > + target->status = -ECONNRESET; > + return target->status; > > default: > return target->status; > -- > 1.8.4.5 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-scsi" in > the body of a message to [email protected] > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
