This is a note to let you know that I've just added the patch titled IB/srp: Fix reconnection failure handling to the 4.1-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: ib-srp-fix-reconnection-failure-handling.patch and it can be found in the queue-4.1 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From a44074f14ba1ea0747ea737026eb929b81993dc3 Mon Sep 17 00:00:00 2001 From: Bart Van Assche <bart.vanassche@xxxxxxxxxxx> Date: Mon, 18 May 2015 13:24:17 +0200 Subject: IB/srp: Fix reconnection failure handling From: Bart Van Assche <bart.vanassche@xxxxxxxxxxx> commit a44074f14ba1ea0747ea737026eb929b81993dc3 upstream. Although it is possible to let SRP I/O continue if a reconnect results in a reduction of the number of channels, the current code does not handle this scenario correctly. Instead of making the reconnect code more complex, consider this as a reconnection failure. Signed-off-by: Bart Van Assche <bart.vanassche@xxxxxxxxxxx> Cc: Sagi Grimberg <sagig@xxxxxxxxxxxx> Cc: Sebastian Parschauer <sebastian.riemer@xxxxxxxxxxxxxxxx> Signed-off-by: Doug Ledford <dledford@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/infiniband/ulp/srp/ib_srp.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) --- a/drivers/infiniband/ulp/srp/ib_srp.c +++ b/drivers/infiniband/ulp/srp/ib_srp.c @@ -1243,11 +1243,8 @@ static int srp_rport_reconnect(struct sr for (i = 0; i < target->ch_count; i++) { ch = &target->ch[i]; - if (ret || !ch->target) { - if (i > 1) - ret = 0; + if (ret || !ch->target) break; - } ret = srp_connect_ch(ch, multich); multich = true; } Patches currently in stable-queue which might be from bart.vanassche@xxxxxxxxxxx are queue-4.1/ib-srp-fix-a-connection-setup-race.patch queue-4.1/scsi_transport_srp-introduce-srp_wait_for_queuecommand.patch queue-4.1/ib-srp-fix-connection-state-tracking.patch queue-4.1/ib-srp-fix-reconnection-failure-handling.patch queue-4.1/scsi_transport_srp-fix-a-race-condition.patch queue-4.1/ib-srp-remove-an-extraneous-scsi_host_put-from-an-error-path.patch -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html