tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

scsi: libsas: move bus_reset_handler() to target_reset_handler()

The bus reset handler is calling I_T Nexus reset, which logically is a
target reset as it need to specify both the initiator and the target.
So move it to target reset.

Signed-off-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

authored by

Hannes Reinecke and committed by
Martin K. Petersen cc199e78 e13849b7

+12 -12
+1 -1
drivers/scsi/aic94xx/aic94xx_init.c
··· 70 70 .max_sectors = SCSI_DEFAULT_MAX_SECTORS, 71 71 .use_clustering = ENABLE_CLUSTERING, 72 72 .eh_device_reset_handler = sas_eh_device_reset_handler, 73 - .eh_bus_reset_handler = sas_eh_bus_reset_handler, 73 + .eh_target_reset_handler = sas_eh_target_reset_handler, 74 74 .target_destroy = sas_target_destroy, 75 75 .ioctl = sas_ioctl, 76 76 .track_queue_depth = 1,
+1 -1
drivers/scsi/hisi_sas/hisi_sas_main.c
··· 1562 1562 .max_sectors = SCSI_DEFAULT_MAX_SECTORS, 1563 1563 .use_clustering = ENABLE_CLUSTERING, 1564 1564 .eh_device_reset_handler = sas_eh_device_reset_handler, 1565 - .eh_bus_reset_handler = sas_eh_bus_reset_handler, 1565 + .eh_target_reset_handler = sas_eh_target_reset_handler, 1566 1566 .target_destroy = sas_target_destroy, 1567 1567 .ioctl = sas_ioctl, 1568 1568 };
+1 -1
drivers/scsi/isci/init.c
··· 166 166 .use_clustering = ENABLE_CLUSTERING, 167 167 .eh_abort_handler = sas_eh_abort_handler, 168 168 .eh_device_reset_handler = sas_eh_device_reset_handler, 169 - .eh_bus_reset_handler = sas_eh_bus_reset_handler, 169 + .eh_target_reset_handler = sas_eh_target_reset_handler, 170 170 .target_destroy = sas_target_destroy, 171 171 .ioctl = sas_ioctl, 172 172 .shost_attrs = isci_host_attrs,
+6 -6
drivers/scsi/libsas/sas_scsi_host.c
··· 526 526 return FAILED; 527 527 } 528 528 529 - int sas_eh_bus_reset_handler(struct scsi_cmnd *cmd) 529 + int sas_eh_target_reset_handler(struct scsi_cmnd *cmd) 530 530 { 531 531 int res; 532 532 struct Scsi_Host *host = cmd->device->host; ··· 554 554 struct Scsi_Host *shost = cmd->device->host; 555 555 556 556 if (!shost->hostt->eh_device_reset_handler) 557 - goto try_bus_reset; 557 + goto try_target_reset; 558 558 559 559 res = shost->hostt->eh_device_reset_handler(cmd); 560 560 if (res == SUCCESS) 561 561 return res; 562 562 563 - try_bus_reset: 564 - if (shost->hostt->eh_bus_reset_handler) 565 - return shost->hostt->eh_bus_reset_handler(cmd); 563 + try_target_reset: 564 + if (shost->hostt->eh_target_reset_handler) 565 + return shost->hostt->eh_target_reset_handler(cmd); 566 566 567 567 return FAILED; 568 568 } ··· 993 993 EXPORT_SYMBOL_GPL(sas_task_abort); 994 994 EXPORT_SYMBOL_GPL(sas_phy_reset); 995 995 EXPORT_SYMBOL_GPL(sas_eh_device_reset_handler); 996 - EXPORT_SYMBOL_GPL(sas_eh_bus_reset_handler); 996 + EXPORT_SYMBOL_GPL(sas_eh_target_reset_handler); 997 997 EXPORT_SYMBOL_GPL(sas_target_destroy); 998 998 EXPORT_SYMBOL_GPL(sas_ioctl);
+1 -1
drivers/scsi/mvsas/mv_init.c
··· 61 61 .max_sectors = SCSI_DEFAULT_MAX_SECTORS, 62 62 .use_clustering = ENABLE_CLUSTERING, 63 63 .eh_device_reset_handler = sas_eh_device_reset_handler, 64 - .eh_bus_reset_handler = sas_eh_bus_reset_handler, 64 + .eh_target_reset_handler = sas_eh_target_reset_handler, 65 65 .target_destroy = sas_target_destroy, 66 66 .ioctl = sas_ioctl, 67 67 .shost_attrs = mvst_host_attrs,
+1 -1
drivers/scsi/pm8001/pm8001_init.c
··· 86 86 .max_sectors = SCSI_DEFAULT_MAX_SECTORS, 87 87 .use_clustering = ENABLE_CLUSTERING, 88 88 .eh_device_reset_handler = sas_eh_device_reset_handler, 89 - .eh_bus_reset_handler = sas_eh_bus_reset_handler, 89 + .eh_target_reset_handler = sas_eh_target_reset_handler, 90 90 .target_destroy = sas_target_destroy, 91 91 .ioctl = sas_ioctl, 92 92 .shost_attrs = pm8001_host_attrs,
+1 -1
include/scsi/libsas.h
··· 714 714 void sas_task_abort(struct sas_task *); 715 715 int sas_eh_abort_handler(struct scsi_cmnd *cmd); 716 716 int sas_eh_device_reset_handler(struct scsi_cmnd *cmd); 717 - int sas_eh_bus_reset_handler(struct scsi_cmnd *cmd); 717 + int sas_eh_target_reset_handler(struct scsi_cmnd *cmd); 718 718 719 719 extern void sas_target_destroy(struct scsi_target *); 720 720 extern int sas_slave_alloc(struct scsi_device *);