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 6280c1b6a9fe07976e0e27385db67fb6af1e3f2a..23811e21c23212e5b55821df2afedf6807323460 100644 (file)
--- 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));