- rediff patches

- rel 3

diff --git a/kernel-5.6.patch b/kernel-5.6.patch
index 651d11e694cd6a4f99692210dc90a2cc5c743e63..8bf8ce3c265f59dc0968808e4c1b0ab67c98d586 100644 (file)
--- a/kernel-5.6.patch
+++ b/kernel-5.6.patch
@@ -1,79 +1,9 @@
---- lin_tape-3.0.52/lin_tape_scsi_config.h~    2020-03-05 19:43:09.000000000 +0100
-+++ lin_tape-3.0.52/lin_tape_scsi_config.h     2020-04-04 21:53:09.046695460 +0200
-@@ -223,6 +223,7 @@
- {
-       return single_open(file, tape_read_proc, NULL);
- }
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,6,0)
- static struct file_operations tape_proc_ops = {
-     .owner   = THIS_MODULE,
-     .open    = tape_open_proc,
-@@ -230,6 +231,14 @@
-     .llseek  = seq_lseek,
-     .release = single_release,
- };
-+#else
-+static struct proc_ops tape_proc_ops = {
-+    .proc_open    = tape_open_proc,
-+    .proc_read    = seq_read,
-+    .proc_lseek  = seq_lseek,
-+    .proc_release = single_release,
-+};
-+#endif
- #endif
- 
- int rd_pc_initial
-@@ -255,6 +264,7 @@
- {
-       return single_open(file, changer_read_proc, NULL);
- }
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,6,0)
- static struct file_operations changer_proc_ops = {
-     .owner   = THIS_MODULE,
-     .open    = changer_open_proc,
-@@ -262,6 +272,14 @@
-     .llseek  = seq_lseek,
-     .release = single_release,
- };
-+#else
-+static struct proc_ops changer_proc_ops = {
-+    .proc_open    = changer_open_proc,
-+    .proc_read    = seq_read,
-+    .proc_lseek  = seq_lseek,
-+    .proc_release = single_release,
-+};
-+#endif
- #endif
- 
- static int status_read_proc
-@@ -273,6 +291,7 @@
- {
-       return single_open(file, status_read_proc, NULL);
- }
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,6,0)
- static struct file_operations status_proc_ops = {
-     .owner   = THIS_MODULE,
-     .open    = status_open_proc,
-@@ -280,6 +299,14 @@
-     .llseek  = seq_lseek,
-     .release = single_release,
- };
-+#else
-+static struct proc_ops status_proc_ops = {
-+    .proc_open    = status_open_proc,
-+    .proc_read    = seq_read,
-+    .proc_lseek  = seq_lseek,
-+    .proc_release = single_release,
-+};
-+#endif
- #endif
- 
- int rdstatus_pc_initial
---- lin_tape-3.0.52/lin_tape_ioctl_tape.c~     2020-03-05 19:43:09.000000000 +0100
-+++ lin_tape-3.0.52/lin_tape_ioctl_tape.c      2020-04-04 22:13:44.016713929 +0200
-@@ -25,6 +25,16 @@
- #include "lin_tape_scsi_tape.h"
+diff -urNp -x '*.orig' lin_tape-3.0.52.org/lin_tape_ioctl_tape.c lin_tape-3.0.52/lin_tape_ioctl_tape.c
+--- lin_tape-3.0.52.org/lin_tape_ioctl_tape.c  2021-02-24 22:06:04.675258765 +0100
++++ lin_tape-3.0.52/lin_tape_ioctl_tape.c      2021-02-24 22:06:04.715258642 +0100
+@@ -26,6 +26,16 @@
  #include <linux/delay.h>
+ #include <linux/ktime.h>
  
 +
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0)
@@ -88,7 +18,7 @@
  /*****************************************************************************
   *                                                                           *
   *              Tape Drive Ioctls                                            *
-@@ -2794,7 +2804,7 @@
+@@ -2795,7 +2805,7 @@ EXIT_LABEL:
  
  ssize_t tape_set_tod(struct tape_descriptor** drvp)
  {
@@ -97,7 +27,7 @@
        struct tod_control* buffer = NULL;
        struct tape_descriptor *drv = *drvp;
        int now = 0, rc = STATUS_SUCCESS;
-@@ -2810,20 +2820,20 @@
+@@ -2811,20 +2821,20 @@ ssize_t tape_set_tod(struct tape_descrip
                goto EXIT_LABEL;
        } /* if */
  
@@ -121,7 +51,7 @@
  #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)
        do_gettimeofday(tv);
  #else
-@@ -8930,7 +8940,7 @@
+@@ -8940,7 +8950,7 @@ EXIT_LABEL:
  
  int erp_tod(struct tape_descriptor* drv, union cdb* tmp_cdb, char* sense_data)
  {
@@ -130,7 +60,7 @@
        struct tod_control* tod_buf = NULL;
        int now = 0, rc = -EIO;
  
-@@ -8940,7 +8950,7 @@
+@@ -8950,7 +8960,7 @@ int erp_tod(struct tape_descriptor* drv,
                goto EXIT_LABEL;
        } /* if */
  
@@ -139,7 +69,7 @@
        if(!tv) {
                rc = -ENOMEM;
                goto EXIT_LABEL;
-@@ -8951,7 +8961,7 @@
+@@ -8961,7 +8971,7 @@ int erp_tod(struct tape_descriptor* drv,
        if(rc != STATUS_SUCCESS) goto EXIT_LABEL;
  
        /* get time info to set TOD */
@@ -148,3 +78,75 @@
  #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)
        do_gettimeofday(tv);
  #else
+diff -urNp -x '*.orig' lin_tape-3.0.52.org/lin_tape_scsi_config.h lin_tape-3.0.52/lin_tape_scsi_config.h
+--- lin_tape-3.0.52.org/lin_tape_scsi_config.h 2021-02-24 22:06:04.671925441 +0100
++++ lin_tape-3.0.52/lin_tape_scsi_config.h     2021-02-24 22:06:04.715258642 +0100
+@@ -220,6 +220,7 @@ static int tape_open_proc(struct inode *
+ {
+       return single_open(file, tape_read_proc, NULL);
+ }
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,6,0)
+ static struct file_operations tape_proc_ops = {
+     .owner   = THIS_MODULE,
+     .open    = tape_open_proc,
+@@ -227,6 +228,14 @@ static struct file_operations tape_proc_
+     .llseek  = seq_lseek,
+     .release = single_release,
+ };
++#else
++static struct proc_ops tape_proc_ops = {
++    .proc_open    = tape_open_proc,
++    .proc_read    = seq_read,
++    .proc_lseek  = seq_lseek,
++    .proc_release = single_release,
++};
++#endif
+ #endif
+ 
+ int rd_pc_initial
+@@ -252,6 +261,7 @@ static int changer_open_proc(struct inod
+ {
+       return single_open(file, changer_read_proc, NULL);
+ }
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,6,0)
+ static struct file_operations changer_proc_ops = {
+     .owner   = THIS_MODULE,
+     .open    = changer_open_proc,
+@@ -259,6 +269,14 @@ static struct file_operations changer_pr
+     .llseek  = seq_lseek,
+     .release = single_release,
+ };
++#else
++static struct proc_ops changer_proc_ops = {
++    .proc_open    = changer_open_proc,
++    .proc_read    = seq_read,
++    .proc_lseek  = seq_lseek,
++    .proc_release = single_release,
++};
++#endif
+ #endif
+ 
+ static int status_read_proc
+@@ -270,6 +288,7 @@ static int status_open_proc(struct inode
+ {
+       return single_open(file, status_read_proc, NULL);
+ }
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,6,0)
+ static struct file_operations status_proc_ops = {
+     .owner   = THIS_MODULE,
+     .open    = status_open_proc,
+@@ -277,6 +296,14 @@ static struct file_operations status_pro
+     .llseek  = seq_lseek,
+     .release = single_release,
+ };
++#else
++static struct proc_ops status_proc_ops = {
++    .proc_open    = status_open_proc,
++    .proc_read    = seq_read,
++    .proc_lseek  = seq_lseek,
++    .proc_release = single_release,
++};
++#endif
+ #endif
+ 
+ int rdstatus_pc_initial

diff --git a/lin_tape.spec b/lin_tape.spec
index ddf6e5982dca5258e5af865c525c7a810a27acc3..92d09a3a236ed2d1e0a67495fa712b918667c909 100644 (file)
--- a/lin_tape.spec
+++ b/lin_tape.spec
@@ -5,7 +5,7 @@
 # nothing to be placed to debuginfo package
 %define                _enable_debug_packages  0
 
-%define                rel     2
+%define                rel     3
 %define                pname   lin_tape
 Summary:       IBM Tape SCSI Device Driver for Linux
 Name:          %{pname}%{_alt_kernel}

diff --git a/use-module-dir.patch b/use-module-dir.patch
index 9c079d0ffed65814ed2bb4b417ca0b7e34603ef3..e40a524e8ef5109c890e7fc85bbae2c1a509aa43 100644 (file)
--- a/use-module-dir.patch
+++ b/use-module-dir.patch
@@ -1,6 +1,7 @@
---- lin_tape-1.74.0/Makefile~  2012-08-21 19:32:26.000000000 +0200
-+++ lin_tape-1.74.0/Makefile   2012-09-29 13:26:24.816711524 +0200
-@@ -5,7 +5,7 @@
+diff -urNp -x '*.orig' lin_tape-3.0.52.org/Makefile lin_tape-3.0.52/Makefile
+--- lin_tape-3.0.52.org/Makefile       2021-02-24 22:06:04.385259650 +0100
++++ lin_tape-3.0.52/Makefile   2021-02-24 22:06:04.421926205 +0100
+@@ -5,7 +5,7 @@ ifneq ($(KERNELRELEASE),)
  #include $(PWD)/Kbuild
  
  else
@@ -8,4 +9,4 @@
 +VERSIONRELEASE := $(shell sed --regexp-extended -e '{/\#define LIN_TAPE_VERSION/ s/.*"([0-9.]*)-?([A-Za-z0-9.]*)"/\1 \2/p;d}' $(M)/lin_tape_tape.h)
  endif
  
- obj-m := stmp.o
+ ifeq ($(SFMP), 1)