mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-17 18:51:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2019-06-16 16:09:09 -07:00
parent 70394081c2 86fad676e9
commit 44950dccdf
2 changed files with 37 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nightly/conf/nightly.conf
View File

@@ -3,15 +3,15 @@
ABT_DETAILS="x86_64"
ABT_JOBS=5
ABT_KERNELS=" \
5.1.9 \
5.1.10 \
5.0.20-nc \
4.20.17-nc \
4.19.50-nc \
4.19.51-nc \
4.18.20-nc \
4.17.19-nc \
4.16.18-nc \
4.15.18-nc \
4.14.125-nc \
4.14.126-nc \
4.13.16-nc \
4.12.14-nc \
4.11.12-nc \

56
scst/src/scst_targ.c
View File

@@ -6771,6 +6771,38 @@ out:
return res;
}
static int scst_reset_scsi_target(struct scsi_device *sdev)
{
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 2, 0)
/* To do: implement this functionality. */
WARN_ON_ONCE(true);
return FAILED;
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)
int arg = SG_SCSI_RESET_TARGET;
return scsi_ioctl_reset(sdev, (__force __user int *)&arg);
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)
return scsi_reset_provider(sdev, SCSI_TRY_RESET_TARGET);
#else
return scsi_reset_provider(sdev, SCSI_TRY_RESET_BUS);
#endif
}
static int scst_reset_scsi_device(struct scsi_device *sdev)
{
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 2, 0)
/* To do: implement this functionality. */
WARN_ON_ONCE(true);
return FAILED;
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)
int arg = SG_SCSI_RESET_DEVICE;
return scsi_ioctl_reset(sdev, (__force __user int *)&arg);
#else
return scsi_reset_provider(sdev, SCSI_TRY_RESET_DEVICE);
#endif
}
/* Returns 0 if the command processing should be continued, <0 otherwise */
static int scst_target_reset(struct scst_mgmt_cmd *mcmd)
{
@@ -6837,18 +6869,7 @@ static int scst_target_reset(struct scst_mgmt_cmd *mcmd)
/* dev->scsi_dev must be non-NULL here */
TRACE(TRACE_MGMT, "Resetting host %d bus ",
dev->scsi_dev->host->host_no);
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)
{
int arg = SG_SCSI_RESET_TARGET;
rc = scsi_ioctl_reset(dev->scsi_dev,
(__force __user int *)&arg);
}
#elif 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);
#endif
rc = scst_reset_scsi_target(dev->scsi_dev);
TRACE(TRACE_MGMT, "Result of host %d target reset: %s",
dev->scsi_dev->host->host_no,
(rc == SUCCESS) ? "SUCCESS" : "FAILED");
@@ -6908,16 +6929,7 @@ static int scst_lun_reset(struct scst_mgmt_cmd *mcmd)
if (dev->scsi_dev != NULL) {
TRACE(TRACE_MGMT, "Resetting host %d bus ",
dev->scsi_dev->host->host_no);
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)
{
int arg = SG_SCSI_RESET_DEVICE;
rc = scsi_ioctl_reset(dev->scsi_dev,
(__force __user int *)&arg);
}
#else
rc = scsi_reset_provider(dev->scsi_dev, SCSI_TRY_RESET_DEVICE);
#endif
rc = scst_reset_scsi_device(dev->scsi_dev);
TRACE(TRACE_MGMT, "scsi_reset_provider(%s) returned %d",
dev->virt_name, rc);
#if 0