From 6053d601d013ee9933321f93e348de11c480bc43 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bart.vanassche@sandisk.com>
Date: Thu, 11 Jun 2015 17:08:15 +0000
Subject: [PATCH] scst: Kernel 3.19 build fix (merge r6154 from trunk)

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6286 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 scst/src/scst_targ.c | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/scst/src/scst_targ.c b/scst/src/scst_targ.c
index dcdc94e8b..c64a3b8ab 100644
--- a/scst/src/scst_targ.c
+++ b/scst/src/scst_targ.c
@@ -29,6 +29,7 @@
 #include <linux/kthread.h>
 #include <linux/delay.h>
 #include <linux/ktime.h>
+#include <scsi/sg.h>
 
 #ifdef INSIDE_KERNEL_TREE
 #include <scst/scst.h>
@@ -5961,7 +5962,14 @@ 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(2, 6, 26)
+#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);
@@ -6024,7 +6032,16 @@ 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
 		TRACE(TRACE_MGMT, "scsi_reset_provider(%s) returned %d",
 		      dev->virt_name, rc);
 #if 0