Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 309ce156 authored by Jayamohan Kallickal's avatar Jayamohan Kallickal Committed by James Bottomley
Browse files

[SCSI] libiscsi: Make iscsi_eh_target_reset start with session reset 



The iscsi_eh_target_reset has been modified to attempt
target reset only. If it fails, then iscsi_eh_session_reset
will be called.

Signed-off-by: default avatarMike Christie <michaelc@cs.wisc.edu>
Signed-off-by: default avatarJayamohan Kallickal <jayamohank@serverengines.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent d7b4627f

drivers/infiniband/ulp/iser/iscsi_iser.c

+1 −1
Original line number Diff line number Diff line
@@ -596,7 +596,7 @@ static struct scsi_host_template iscsi_iser_sht = { 
	.cmd_per_lun            = ISER_DEF_CMD_PER_LUN,

	.eh_abort_handler       = iscsi_eh_abort,

	.eh_device_reset_handler= iscsi_eh_device_reset,

	.eh_target_reset_handler= iscsi_eh_target_reset,

	.eh_target_reset_handler = iscsi_eh_recover_target,

	.target_alloc		= iscsi_target_alloc,

	.use_clustering         = DISABLE_CLUSTERING,

	.proc_name              = "iscsi_iser",

drivers/scsi/be2iscsi/be_main.c

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ static struct scsi_host_template beiscsi_sht = { 
	.slave_configure = beiscsi_slave_configure,

	.target_alloc = iscsi_target_alloc,

	.eh_device_reset_handler = iscsi_eh_device_reset,

	.eh_target_reset_handler = iscsi_eh_target_reset,

	.eh_target_reset_handler = iscsi_eh_session_reset,

	.sg_tablesize = BEISCSI_SGLIST_ELEMENTS,

	.can_queue = BE2_IO_DEPTH,

	.this_id = -1,

drivers/scsi/bnx2i/bnx2i_iscsi.c

+1 −1
Original line number Diff line number Diff line
@@ -1989,7 +1989,7 @@ static struct scsi_host_template bnx2i_host_template = { 
	.queuecommand		= iscsi_queuecommand,

	.eh_abort_handler	= iscsi_eh_abort,

	.eh_device_reset_handler = iscsi_eh_device_reset,

	.eh_target_reset_handler = iscsi_eh_target_reset,

	.eh_target_reset_handler = iscsi_eh_recover_target,

	.change_queue_depth	= iscsi_change_queue_depth,

	.can_queue		= 1024,

	.max_sectors		= 127,

drivers/scsi/cxgb3i/cxgb3i_iscsi.c

+1 −1
Original line number Diff line number Diff line
@@ -915,7 +915,7 @@ static struct scsi_host_template cxgb3i_host_template = { 
	.cmd_per_lun		= ISCSI_DEF_CMD_PER_LUN,

	.eh_abort_handler	= iscsi_eh_abort,

	.eh_device_reset_handler = iscsi_eh_device_reset,

	.eh_target_reset_handler = iscsi_eh_target_reset,

	.eh_target_reset_handler = iscsi_eh_recover_target,

	.target_alloc		= iscsi_target_alloc,

	.use_clustering		= DISABLE_CLUSTERING,

	.this_id		= -1,

drivers/scsi/iscsi_tcp.c

+1 −1
Original line number Diff line number Diff line
@@ -874,7 +874,7 @@ static struct scsi_host_template iscsi_sw_tcp_sht = { 
	.cmd_per_lun		= ISCSI_DEF_CMD_PER_LUN,

	.eh_abort_handler       = iscsi_eh_abort,

	.eh_device_reset_handler= iscsi_eh_device_reset,

	.eh_target_reset_handler= iscsi_eh_target_reset,

	.eh_target_reset_handler = iscsi_eh_recover_target,

	.use_clustering         = DISABLE_CLUSTERING,

	.slave_alloc            = iscsi_sw_tcp_slave_alloc,

	.slave_configure        = iscsi_sw_tcp_slave_configure,