[packages/lin_tape] - up to 2.9.4 - fixe building with linux 3.19
baggins
baggins at pld-linux.org
Mon Mar 30 20:35:13 CEST 2015
commit bc5f1107654239a8c28dc04af2b2fb4a3a3a91dc
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Mon Mar 30 20:34:54 2015 +0200
- up to 2.9.4
- fixe building with linux 3.19
lin_tape.spec | 8 +-
linux-3.10.patch | 651 -------------------------------------------------------
linux-3.19.patch | 52 +++++
3 files changed, 56 insertions(+), 655 deletions(-)
---
diff --git a/lin_tape.spec b/lin_tape.spec
index fc3f116..10c9c29 100644
--- a/lin_tape.spec
+++ b/lin_tape.spec
@@ -5,18 +5,18 @@
# nothing to be placed to debuginfo package
%define _enable_debug_packages 0
-%define rel 3
+%define rel 1
%define pname lin_tape
Summary: IBM Tape SCSI Device Driver for Linux
Name: %{pname}%{_alt_kernel}
-Version: 2.9.1
+Version: 2.9.4
Release: %{rel}%{?_pld_builder:@%{_kernel_ver_str}}
License: GPL v2/LGPL
Group: Base/Kernel
Source0: %{pname}-%{version}.tgz
-# Source0-md5: 305d2922f942a73f0f0b30fa49b92dd5
+# Source0-md5: 343e4fbc132880bdecb4f66f061112e9
Patch0: use-module-dir.patch
-Patch1: linux-3.10.patch
+Patch1: linux-3.19.patch
Patch2: insecure-perms.patch
# System Storage, Tape systems, Tape drivers and software, Tape device drivers (Linux)
URL: http://www.ibm.com/support/fixcentral/
diff --git a/linux-3.10.patch b/linux-3.10.patch
deleted file mode 100644
index 3020ea6..0000000
--- a/linux-3.10.patch
+++ /dev/null
@@ -1,651 +0,0 @@
-diff -ur lin_tape-2.1.0/lin_tape_scsi_config.c lin_tape-2.1.0-3.10/lin_tape_scsi_config.c
---- lin_tape-2.1.0/lin_tape_scsi_config.c 2013-06-12 23:07:31.000000000 +0200
-+++ lin_tape-2.1.0-3.10/lin_tape_scsi_config.c 2013-08-25 14:24:13.053537972 +0200
-@@ -3150,6 +3150,31 @@
- return;
- } /* lin_tape_delete_tsm_pseudo() */
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
-+static int tape_proc_open(struct inode *inode, struct file *file)
-+{
-+ return single_open(file, tape_read_proc, PDE_DATA(inode));
-+}
-+
-+static int changer_proc_open(struct inode *inode, struct file *file)
-+{
-+ return single_open(file, changer_read_proc, PDE_DATA(inode));
-+}
-+
-+static const struct file_operations tape_proc_fops = {
-+ .open = tape_proc_open,
-+ .read = seq_read,
-+ .llseek = seq_lseek,
-+ .release = single_release,
-+};
-+
-+static const struct file_operations changer_proc_fops = {
-+ .open = changer_proc_open,
-+ .read = seq_read,
-+ .llseek = seq_lseek,
-+ .release = single_release,
-+};
-+#endif
- /*******************************************************************************
- * *
- * NAME: lin_tape_create_proc *
-@@ -3167,42 +3191,56 @@
- DbgPrint(("lin_tape: lin_tape_create_proc entry\n"));
-
- WRITE_LOCK(&lin_tape_lock);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- if(!tape_proc_entry) {
- tape_proc_entry =
- create_proc_entry("scsi/IBMtape", 0, NULL);
-
- if(!tape_proc_entry) {
- DbgPrint(("lin_tape: cannot initialize "\
- "/proc/scsi/IBMtape\n"));
- goto EXIT_LABEL;
- } /* if */
-
- tape_proc_entry->read_proc = tape_read_proc;
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
- tape_proc_entry->owner = THIS_MODULE;
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
- tape_proc_entry->get_info = NULL;
- #endif
- #endif
-+#else
-+ if (!proc_create("scsi/IBMtape", 0, NULL, &tape_proc_fops)) {
-+ DbgPrint(("lin_tape: cannot initialize "\
-+ "/proc/scsi/IBMtape\n"));
-+ goto EXIT_LABEL;
-+#endif
- } /* if */
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- if(!changer_proc_entry) {
- changer_proc_entry =
- create_proc_entry("scsi/IBMchanger", 0, NULL);
-
- if(!changer_proc_entry) {
- DbgPrint(("lin_tape: cannot initialize "\
- "/proc/scsi/IBMchanger\n"));
- goto EXIT_LABEL;
- } /* if */
-
- changer_proc_entry->read_proc = changer_read_proc;
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
- changer_proc_entry->owner = THIS_MODULE;
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
- changer_proc_entry->get_info = NULL;
- #endif
- #endif
-+#else
-+ if (!proc_create("scsi/IBMchanger", 0, NULL, &changer_proc_fops)) {
-+ DbgPrint(("lin_tape: cannot initialize "\
-+ "/proc/scsi/IBMchanger\n"));
-+ goto EXIT_LABEL;
-+#endif
- } /* if */
-
- EXIT_LABEL:
-@@ -3229,15 +3227,20 @@
- {
- WRITE_LOCK(&lin_tape_lock);
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- if(tape_proc_entry) {
- remove_proc_entry("scsi/IBMtape", NULL);
- tape_proc_entry = NULL;
- } /* if */
-
- if(changer_proc_entry) {
- remove_proc_entry("scsi/IBMchanger", NULL);
- changer_proc_entry = NULL;
- } /* if */
-+#else
-+ remove_proc_entry("scsi/IBMtape", NULL);
-+ remove_proc_entry("scsi/IBMchanger", NULL);
-+#endif
-
- WRITE_UNLOCK(&lin_tape_lock);
-
-@@ -3262,51 +3253,80 @@
- * *
- *******************************************************************************/
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- static int tape_read_proc(char* buffer, char** start, off_t offset, int length,
- int* eof, void* data)
-+#else
-+static int tape_read_proc(struct seq_file *m, void* data)
-+#endif
- {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- int buf_offset = 0, i = 0, start_dev = 0, found = 0, linelen = 0;
- unchar* model = NULL, * pre_buf = NULL;
- unchar temp_buf[96];
-+#else
-+ int i = 0, found = 0;
-+ unchar* model = NULL;
-+#endif
- char* sn = NULL;
- boolean tape_des_locked = False;
-
- DbgPrint(("lin_tape: tape_read_proc entry\n"));
-
- model = kmalloc(12, GFP_KERNEL);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- pre_buf = kmalloc(ONE_K / 4, GFP_KERNEL);
-+#endif
- sn = kmalloc(MaxSerialNumberSize + 1, GFP_KERNEL);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- if(!model || !pre_buf || !sn || !buffer || !start || !eof) {
- if(start) *start = buffer;
- if(eof) *eof = True;
-+#else
-+ if(!model || !sn) {
-+#endif
- goto EXIT_LABEL;
- } /* if */
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- memset(temp_buf, '\0', 96);
-+#endif
- memset(model, '\0', 12);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- memset(pre_buf, '\0', ONE_K / 4);
-+#endif
- memset(sn, '\0', MaxSerialNumberSize + 1);
-
- i = 0;
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- if(!offset && rd_pc_initial(buffer, &buf_offset, length, start, False))
- goto EXIT_LABEL;
-
- if(rd_pc_start_dev(&start_dev, eof, offset, buffer, &buf_offset, False))
- goto EXIT_LABEL;
-+#else
-+ rd_pc_initial(m, False);
-+#endif
-
- READ_LOCK(&tape_des_lock);
- tape_des_locked = True;
-
- if(!tape_devs) {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- *eof = True;
- if(buf_offset == length) buf_offset--;
- buf_offset += sprintf(&buffer[buf_offset], "\n");
- *start = buffer;
-+#endif
- goto EXIT_LABEL;
- } /* if */
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- for(i = start_dev; i < MaxLinTapeDevices; i++) {
-+#else
-+ for(i = 0; i < MaxLinTapeDevices; i++) {
-+#endif
- if(!tape_devs[i] || !tape_devs[i]->dev_obj) continue;
-
- found = False;
-@@ -3326,8 +3301,12 @@
- sn[strlen(sn) - 1] == '\t'))
- sn[strlen(sn) - 1] = '\0';
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- linelen = snprintf(pre_buf, ONE_K / 4,
- "\n%-8d%-12s%-18s%-16s%-16s%-10s",
-+#else
-+ seq_printf(m, "%-8d%-12s%-18s%-16s",
-+#endif
- i,
- model,
-
-@@ -3335,12 +3309,22 @@
- tape_devs[i]->serial_num_len ? sn : "NA",
-
- tape_devs[i]->ghost_device ? "" :
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- found ? tape_devs[i]->pname : "NA",
-+#else
-+ found ? tape_devs[i]->pname : "NA");
-+#endif
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- tape_devs[i]->ghost_device ? "" :
- scsi_addr_str(tape_devs[i], temp_buf,
- False),
-+#else
-+ if (!tape_devs[i]->ghost_device)
-+ scsi_addr_str(tape_devs[i], m, False);
-
-+ seq_printf(m, "%-10s\n",
-+#endif
- tape_devs[i]->ghost_device ? "" :
- !found ? "NA" :
- !tape_devs[i]->serial_num_len ? "NA" :
-@@ -3349,45 +3323,59 @@
- tape_devs[i]->isPrimary ? "Primary" :
- "Alternate");
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- if(buf_offset > length) {
- buf_offset = length;
- break;
- } else if(buf_offset + linelen >= length) {
- memset(&buffer[buf_offset], ' ', length - buf_offset);
- buf_offset = length;
- break;
- } /* if */
-
- buf_offset += sprintf(&buffer[buf_offset], "%s", pre_buf);
-+#endif
- tape_devs[i]->proc_read = True;
- } /* for */
-
- tape_des_locked = False;
- READ_UNLOCK(&tape_des_lock);
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- if(i == start_dev || i >= MaxLinTapeDevices) {
- if(buf_offset == length) buf_offset--;
- buf_offset += sprintf(&buffer[buf_offset], "\n");
- *eof = True;
- if(i >= MaxLinTapeDevices) *start = buffer;
- goto EXIT_LABEL;
- } /* if */
-
- *start = buffer;
-+#endif
-
- EXIT_LABEL:
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- if(pre_buf) kfree(pre_buf);
-+#endif
- if(model) kfree(model);
- if(sn) kfree(sn);
-
- if(tape_des_locked) READ_UNLOCK(&tape_des_lock);
- tape_des_locked = False;
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- if(buf_offset == 1 && *eof) buf_offset = 0;
- DbgPrint(("tape_read_proc exit: %d\n", buf_offset));
-+#else
-+ DbgPrint(("tape_read_proc exit:\n"));
-+#endif
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- return buf_offset;
-+#else
-+ return 0;
-+#endif
- } /* tape_read_proc() */
-
- /*******************************************************************************
-@@ -3409,12 +3361,21 @@
- * *
- *******************************************************************************/
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- static int changer_read_proc(char* buffer, char** start, off_t offset,
- int length, int* eof, void* data)
-+#else
-+static int changer_read_proc(struct seq_file *m, void* data)
-+#endif
- {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- int buf_offset = 0, i = 0, start_dev = 0, found = 0, linelen = 0;
- unchar* model = NULL, * pre_buf = NULL;
- unchar temp_buf[96];
-+#else
-+ int i = 0, found = 0;
-+ unchar* model = NULL;
-+#endif
- char* sn = NULL;
- boolean changer_des_locked = False;
-
-@@ -3423,37 +3373,57 @@
- i = 0;
-
- model = kmalloc(12, GFP_KERNEL);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- pre_buf = kmalloc(ONE_K / 4, GFP_KERNEL);
-+#endif
- sn = kmalloc(MaxSerialNumberSize + 1, GFP_KERNEL);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- if(!model || !pre_buf || !sn || !buffer || !start || !eof) {
- if(start) *start = buffer;
- if(eof) *eof = True;
-+#else
-+ if(!model || !sn) {
-+#endif
- goto EXIT_LABEL;
- } /* if */
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- memset(temp_buf, '\0', 96);
-+#endif
- memset(model, '\0', 12);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- memset(pre_buf, '\0', ONE_K / 4);
-+#endif
- memset(sn, '\0', MaxSerialNumberSize + 1);
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- if(!offset && rd_pc_initial(buffer, &buf_offset, length, start, True))
- goto EXIT_LABEL;
-
- if(rd_pc_start_dev(&start_dev, eof, offset, buffer, &buf_offset, True))
- goto EXIT_LABEL;
-+#else
-+ rd_pc_initial(m, True);
-+#endif
-
- READ_LOCK(&changer_des_lock);
- changer_des_locked = True;
-
- if(!changer_devs) {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- *eof = True;
- if(buf_offset == length) buf_offset--;
- buf_offset += sprintf(&buffer[buf_offset], "\n");
- *start = buffer;
-+#endif
- goto EXIT_LABEL;
- } /* if */
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- for(i = start_dev; i < MaxLinTapeChangerDevices; i++) {
-+#else
-+ for(i = 0; i < MaxLinTapeChangerDevices; i++) {
-+#endif
- if(!changer_devs[i] || !changer_devs[i]->dev_obj) continue;
-
- found = False;
-@@ -3472,8 +3409,12 @@
- sn[strlen(sn) - 1] == '\t'))
- sn[strlen(sn) - 1] = '\0';
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- linelen = snprintf(pre_buf, ONE_K / 4,
- "\n%-8d%-12s%-18s%-16s%-16s%-10s",
-+#else
-+ seq_printf(m, "%-8d%-12s%-18s%-16s",
-+#endif
- i,
- model,
-
-@@ -3481,14 +3417,24 @@
- changer_devs[i]->serial_num_len ? sn : "NA",
-
- changer_devs[i]->ghost_device ? "" :
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- found ? changer_devs[i]->pname : "NA",
-+#else
-+ found ? changer_devs[i]->pname : "NA");
-+#endif
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- changer_devs[i]->ghost_device ? "" :
- scsi_addr_str((struct tape_descriptor*)
- changer_devs[i],
- temp_buf,
- True),
-+#else
-+ if (!changer_devs[i]->ghost_device)
-+ scsi_addr_str((struct tape_descriptor*)changer_devs[i], m, True);
-
-+ seq_printf(m, "%-10s\n",
-+#endif
- changer_devs[i]->ghost_device ? "" :
- !found ? "NA" :
- changer_devs[i]->chg_id == IBM_3590
-@@ -3498,45 +3432,59 @@
- changer_devs[i]->isPrimary ? "Primary" :
- "Alternate");
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- if(buf_offset > length) {
- buf_offset = length;
- break;
- } else if(buf_offset + linelen >= length) {
- memset(&buffer[buf_offset], ' ', length - buf_offset);
- buf_offset = length;
- break;
- } /* if */
-
- buf_offset += sprintf(&buffer[buf_offset], "%s", pre_buf);
-+#endif
- changer_devs[i]->proc_read = True;
- } /* for */
-
- changer_des_locked = False;
- READ_UNLOCK(&changer_des_lock);
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- if(i == start_dev || i >= MaxLinTapeChangerDevices) {
- if(buf_offset == length) buf_offset--;
- buf_offset += sprintf(&buffer[buf_offset], "\n");
- *eof = True;
- if(i >= MaxLinTapeChangerDevices) *start = buffer;
- goto EXIT_LABEL;
- } /* if */
-
- *start = buffer;
-+#endif
-
- EXIT_LABEL:
-
- if(model) kfree(model);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- if(pre_buf) kfree(pre_buf);
-+#endif
- if(sn) kfree(sn);
-
- if(changer_des_locked) READ_UNLOCK(&changer_des_lock);
- changer_des_locked = False;
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- if(buf_offset == 1 && *eof) buf_offset = 0;
- DbgPrint(("changer_read_proc exit: %d\n", buf_offset));
-+#else
-+ DbgPrint(("changer_read_proc exit\n"));
-+#endif
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- return buf_offset;
-+#else
-+ return 0;
-+#endif
- } /* changer_read_proc() */
-
- /*******************************************************************************
-@@ -3557,15 +3469,25 @@
- * *
- *******************************************************************************/
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- int rd_pc_initial(char* buffer, int* buf_offset, int length, char** start,
- boolean chg)
-+#else
-+int rd_pc_initial(struct seq_file *m, boolean chg)
-+#endif
- {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- int rc = 1, count = 0, i = 0, max_devices = 0;
- char tmp_buf[96];
-+#else
-+ int i = 0, max_devices = 0;
-+#endif
-
- DbgPrint(("rd_pc_initial entry\n"));
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- memset(tmp_buf, '\0', 96);
-+#endif
- max_devices = chg ? MaxLinTapeChangerDevices : MaxLinTapeDevices;
-
- /* set proc_read flag for each logical device to false */
-@@ -3580,47 +3489,59 @@
- } /* if */
- WRITE_UNLOCK(chg ? &changer_des_lock : &tape_des_lock);
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- count = sprintf(tmp_buf, "lin_tape version: %s", LIN_TAPE_VERSION);
- if(count > length) goto EXIT_LABEL;
-
- count = sprintf(buffer, "lin_tape version: %s", LIN_TAPE_VERSION);
- *buf_offset = count;
-
- count = sprintf(tmp_buf, "\nlin_tape major number: %d", lin_tape_major);
- if(*buf_offset + count > length) goto EXIT_LABEL;
-
- count = sprintf(buffer + *buf_offset,
- "\nlin_tape major number: %d", lin_tape_major);
- *buf_offset += count;
-
- count = sprintf(tmp_buf, "\nAttached %s Devices:",
- chg ? "Changer" : "Tape");
- if(*buf_offset + count > length) goto EXIT_LABEL;
-
- count = sprintf(buffer + *buf_offset, "\nAttached %s Devices:",
- chg ? "Changer" : "Tape");
- *buf_offset += count;
-
- count = sprintf(tmp_buf, "\n%-8s%-12s%-18s%-16s%-16s%-10s",
- "Number", "model", "SN", "HBA", "SCSI", "FO Path");
- if(*buf_offset + count > length) goto EXIT_LABEL;
-
- count = sprintf(buffer + *buf_offset, "\n%-8s%-12s%-18s%-16s%-16s%-10s",
-+#else
-+ seq_printf(m, "lin_tape version: %s\n", LIN_TAPE_VERSION);
-+ seq_printf(m, "lin_tape major number: %d\n", lin_tape_major);
-+ seq_printf(m, "Attached %s Devices:\n", chg ? "Changer" : "Tape");
-+ seq_printf(m, "%-8s%-12s%-18s%-16s%-16s%-10s\n",
-+#endif
- "Number", "model", "SN", "HBA", "SCSI", "FO Path");
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- *buf_offset += count;
-
- rc = 0;
-
- EXIT_LABEL:
-
- if(rc) {
- memset(buffer + *buf_offset, ' ', length - *buf_offset);
- *buf_offset = length;
- *start = buffer;
- } /* if */
-
- DbgPrint(("rd_pc_initial exit: %d\n", rc));
- return rc;
-+#else
-+ DbgPrint(("rd_pc_initial exit\n"));
-+ return 0;
-+#endif
- } /* rd_pc_initial() */
-
- /*******************************************************************************
-@@ -3642,8 +3518,13 @@
- * *
- *******************************************************************************/
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- int rd_pc_start_dev(int* start_dev, int* eof, off_t offset, char* buffer,
- int* buf_offset, boolean chg)
-+#else
-+int rd_pc_start_dev(int* start_dev, int* eof, off_t offset, struct seq_file *m,
-+ boolean chg)
-+#endif
- {
- int found = False, rc = 0, i = 0, max_devices = 0;
-
-@@ -3678,7 +3554,11 @@
-
- if(*start_dev >= max_devices) {
- *eof = True;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- *buf_offset += sprintf(&buffer[*buf_offset], "\n");
-+#else
-+ seq_printf(m, "\n");
-+#endif
- rc = 1;
- goto EXIT_LABEL;
- } /* if */
-@@ -3705,17 +3581,31 @@
- * *
- *******************************************************************************/
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- char* scsi_addr_str(struct tape_descriptor* drv, char* buffer, boolean cgr)
-+#else
-+void scsi_addr_str(struct tape_descriptor* drv, struct seq_file *m, boolean cgr)
-+#endif
- {
- struct changer_descriptor* chg = (struct changer_descriptor*)drv;
-
- if(cgr)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- sprintf(buffer, "%d:%d:%d:%d",
-+#else
-+ seq_printf(m, "%d:%d:%d:%d",
-+#endif
- chg->host, chg->channel, chg->target, chg->lun);
- else
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- sprintf(buffer, "%d:%d:%d:%d",
-+#else
-+ seq_printf(m, "%d:%d:%d:%d",
-+#endif
- drv->host, drv->channel, drv->target, drv->lun);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- return buffer;
-+#endif
- } /* scsi_addr_str() */
-
- /*******************************************************************************
-diff -ur lin_tape-2.1.0/lin_tape_scsi_config.h lin_tape-2.1.0-3.10/lin_tape_scsi_config.h
---- lin_tape-2.1.0/lin_tape_scsi_config.h 2013-06-12 23:07:31.000000000 +0200
-+++ lin_tape-2.1.0-3.10/lin_tape_scsi_config.h 2013-08-25 14:22:14.635373745 +0200
-@@ -178,14 +178,24 @@
- #endif
- static void lin_tape_rescan(struct device *);
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- static int tape_read_proc(char *, char **, off_t, int, int *, void *);
- int rd_pc_initial(char* buffer, int* buf_offset, int length, char** start,
- boolean chg);
- int rd_pc_start_dev(int* start_dev, int* eof, off_t offset, char* buffer,
- int* buf_offset, boolean chg);
- char* scsi_addr_str(struct tape_descriptor* drv, char* buffer, boolean cgr);
-+#else
-+static int tape_read_proc(struct seq_file *, void *);
-+int rd_pc_initial(struct seq_file *, boolean chg);
-+void scsi_addr_str(struct tape_descriptor* drv, struct seq_file *m, boolean cgr);
-+#endif
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- static int changer_read_proc(char *, char **, off_t, int, int *, void *);
-+#else
-+static int changer_read_proc(struct seq_file *, void *);
-+#endif
-
- /* global variables */
- static unchar lin_tape_cleanup_module = 0;
-@@ -222,8 +219,10 @@
- atomic_t tsm_tp_open = {0};
- static unsigned int lin_tape_major;
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- static struct proc_dir_entry *tape_proc_entry = NULL;
- static struct proc_dir_entry *changer_proc_entry = NULL;
-+#endif
-
- #if LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0)
- rwlock_t hba_lock = RW_LOCK_UNLOCKED;
diff --git a/linux-3.19.patch b/linux-3.19.patch
new file mode 100644
index 0000000..cb73e92
--- /dev/null
+++ b/linux-3.19.patch
@@ -0,0 +1,52 @@
+--- lin_tape-2.9.4/lin_tape_scsi_config.c~ 2015-03-30 20:27:22.000000000 +0200
++++ lin_tape-2.9.4/lin_tape_scsi_config.c 2015-03-30 20:30:52.012073469 +0200
+@@ -6863,9 +6863,13 @@
+ {
+ int rc = -EIO;
+ int minor = -1;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0)
++ struct inode* inode = filp->f_path.dentry->d_inode;
++#else
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
+ struct inode* inode = filp->f_dentry->d_inode;
+ #endif
++#endif
+
+ minor = iminor(inode);
+
+@@ -7129,7 +7133,11 @@
+ int dev_index = 0;
+ boolean des_locked = False, drv_locked = False;
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0)
++ minor = iminor(file->f_path.dentry->d_inode);
++#else
+ minor = iminor(file->f_dentry->d_inode);
++#endif
+ DbgPrint(("lin_tape_read entry: minor %d\n", minor));
+
+ if(minor >= LinTapeChangerOffset) {
+@@ -7236,7 +7244,11 @@
+ int dev_index = 0;
+ boolean des_locked = False, drv_locked = False;
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0)
++ minor = iminor(file->f_path.dentry->d_inode);
++#else
+ minor = iminor(file->f_dentry->d_inode);
++#endif
+ DbgPrint(("lin_tape_write entry: minor %d\n", minor));
+
+ if(minor >= LinTapeChangerOffset) {
+--- lin_tape-2.9.4/lin_tape_scsi_config.h~ 2014-10-30 15:22:07.000000000 +0100
++++ lin_tape-2.9.4/lin_tape_scsi_config.h 2015-03-30 20:32:58.852078773 +0200
+@@ -304,7 +304,9 @@
+ static int lin_tape_probe(struct device *dev);
+ static int lin_tape_remove(struct device *dev);
+ static struct scsi_driver lin_tape_driver = {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0)
+ .owner = THIS_MODULE,
++#endif
+ .gendrv = {
+ .name = "lin_tape",
+ .probe = lin_tape_probe,
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lin_tape.git/commitdiff/bc5f1107654239a8c28dc04af2b2fb4a3a3a91dc
More information about the pld-cvs-commit
mailing list