From 7f62d55dde5db90e3c8893c5b141335e9ad63157 Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Thu, 23 Oct 2008 12:03:22 +0000 Subject: [PATCH] Replace SCSI_TRY_RESET_BUS by SCSI_TRY_RESET_TARGET, which is more appropriate for TARGET RESET TM git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@533 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/src/scst_targ.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scst/src/scst_targ.c b/scst/src/scst_targ.c index 0c0b83c75..a4f5e4f57 100644 --- a/scst/src/scst_targ.c +++ b/scst/src/scst_targ.c @@ -4215,9 +4215,13 @@ static int scst_target_reset(struct scst_mgmt_cmd *mcmd) list_for_each_entry(dev, &host_devs, tm_dev_list_entry) { /* dev->scsi_dev must be non-NULL here */ TRACE(TRACE_MGMT, "Resetting host %d bus ", - dev->scsi_dev->host->host_no); + dev->scsi_dev->host->host_no); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) + rc = scsi_reset_provider(dev->scsi_dev, SCSI_TRY_RESET_TARGET); +#else rc = scsi_reset_provider(dev->scsi_dev, SCSI_TRY_RESET_BUS); - TRACE(TRACE_MGMT, "Result of host %d bus reset: %s", +#endif + TRACE(TRACE_MGMT, "Result of host %d target reset: %s", dev->scsi_dev->host->host_no, (rc == SUCCESS) ? "SUCCESS" : "FAILED"); #if 0 /* scsi_reset_provider() returns very weird status, so let's always succeed */