From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 19 Mar 2018 13:48:44 +0000 (+0100)
Subject: fix 3.18.y scsi patch
X-Git-Tag: v4.15.12~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6d1860e6dfa012cf1ab18970f207802738aa5e94;p=thirdparty%2Fkernel%2Fstable-queue.git

fix 3.18.y scsi patch
---

diff --git a/queue-3.18/scsi-sg-only-check-for-dxfer_len-greater-than-256m.patch b/queue-3.18/scsi-sg-only-check-for-dxfer_len-greater-than-256m.patch
index 6280c1b6a9f..23811e21c23 100644
--- a/queue-3.18/scsi-sg-only-check-for-dxfer_len-greater-than-256m.patch
+++ b/queue-3.18/scsi-sg-only-check-for-dxfer_len-greater-than-256m.patch
@@ -24,12 +24,20 @@ Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 ---
- drivers/scsi/sg.c |   31 +------------------------------
- 1 file changed, 1 insertion(+), 30 deletions(-)
+ drivers/scsi/sg.c |   32 ++------------------------------
+ 1 file changed, 2 insertions(+), 30 deletions(-)
 
 --- a/drivers/scsi/sg.c
 +++ b/drivers/scsi/sg.c
-@@ -762,35 +762,6 @@ sg_new_write(Sg_fd *sfp, struct file *fi
+@@ -51,6 +51,7 @@ static int sg_version_num = 30536;	/* 2
+ #include <linux/mutex.h>
+ #include <linux/atomic.h>
+ #include <linux/ratelimit.h>
++#include <linux/sizes.h>
+ 
+ #include "scsi.h"
+ #include <scsi/scsi_dbg.h>
+@@ -762,35 +763,6 @@ sg_new_write(Sg_fd *sfp, struct file *fi
  	return count;
  }
  
@@ -65,7 +73,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  static int
  sg_common_write(Sg_fd * sfp, Sg_request * srp,
  		unsigned char *cmnd, int timeout, int blocking)
-@@ -811,7 +782,7 @@ sg_common_write(Sg_fd * sfp, Sg_request
+@@ -811,7 +783,7 @@ sg_common_write(Sg_fd * sfp, Sg_request
  			"sg_common_write:  scsi opcode=0x%02x, cmd_size=%d\n",
  			(int) cmnd[0], (int) hp->cmd_len));