]> git.pld-linux.org Git - packages/lin_tape.git/blame - clean-ifdefs.patch
projects / packages / lin_tape.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- updated to 3.0.20
[packages/lin_tape.git] / clean-ifdefs.patch
CommitLineData
300a759d
JR		 1diff -ur lin_tape-3.0.18/Makefile lin_tape-3.0.18-ifdefs/Makefile
2--- lin_tape-3.0.18/Makefile 2017-05-09 21:11:32.977092391 +0200
3+++ lin_tape-3.0.18-ifdefs/Makefile 2017-05-09 21:05:59.610307494 +0200
4@@ -20,15 +20,6 @@
6986ddb6
JR		 5 lin_tape-objs := join.o lin_tape_scsi_config.o lin_tape_scsi_tape.o lin_tape_scsi_trace.o \
6 lin_tape_ioctl_tape.o lin_tape_ioctl_changer.o lin_tape_extra_ioctl.o
7
8-RHELRELEASE := $(shell [ -f "/etc/redhat-release" ] && echo 1 || echo 0)
9-ifeq ($(RHELRELEASE), 1)
10-KERNELDIR ?= /lib/modules/$(shell uname -r)/build
300a759d 11-KERNELVER = $(shell uname -r 2>/dev/null|sed "s/[\.-]/_/g"|sed "s/\([0-9]*_[0-9]*_[0-9]*_[0-9]*\).*/\1/")
6986ddb6
JR		 12-EXTRA_CFLAGS += -DKERNELVERSION_${KERNELVER}
13-else
14-EXTRA_CFLAGS += -DSLESVERSION
15-endif
300a759d
JR		 16-
17 ifeq ($(SFMP), 1)
18 EXTRA_CFLAGS += -DSFMPENABLED
19 endif
20diff -ur lin_tape-3.0.18/pfo.h lin_tape-3.0.18-ifdefs/pfo.h
21--- lin_tape-3.0.18/pfo.h 2017-02-23 19:14:41.000000000 +0100
22+++ lin_tape-3.0.18-ifdefs/pfo.h 2017-05-09 21:06:34.117699008 +0200
9752ce8d 23@@ -26,109 +26,6 @@
6986ddb6
JR		 24 * will build for various releases of Linux. This is how
25 * we track different versions using ifdef in the source.
26 */
27-#ifdef KERNELVERSION_2_6_32_220
28-#define BEFORE_RH_63 1
29-#define BEFORE_RH_64 1
30-#define BEFORE_RH_65 1
31-#define BEFORE_RH_66 1
32-#define BEFORE_RH_67 1
33-#define BEFORE_RH_70 1
34-#define BEFORE_RH_71 1
300a759d 35-#define BEFORE_RH_72 1
6986ddb6
JR		 36-#endif
37-#ifdef KERNELVERSION_2_6_32_279
38-#define AFTER_RH_62 1
39-#define BEFORE_RH_64 1
40-#define BEFORE_RH_65 1
41-#define BEFORE_RH_66 1
42-#define BEFORE_RH_67 1
43-#define BEFORE_RH_70 1
44-#define BEFORE_RH_71 1
300a759d 45-#define BEFORE_RH_72 1
6986ddb6
JR		 46-#endif
47-#ifdef KERNELVERSION_2_6_32_358
48-#define AFTER_RH_62 1
49-#define AFTER_RH_63 1
50-#define BEFORE_RH_65 1
51-#define BEFORE_RH_66 1
52-#define BEFORE_RH_67 1
53-#define BEFORE_RH_70 1
300a759d 54-#define BEFORE_RH_72 1
6986ddb6
JR		 55-#endif
56-#ifdef KERNELVERSION_2_6_32_431
57-#define AFTER_RH_62 1
58-#define AFTER_RH_63 1
59-#define AFTER_RH_64 1
60-#define BEFORE_RH_66 1
61-#define BEFORE_RH_67 1
62-#define BEFORE_RH_70 1
63-#define BEFORE_RH_71 1
300a759d 64-#define BEFORE_RH_72 1
6986ddb6
JR		 65-#endif
66-#ifdef KERNELVERSION_2_6_32_504
67-#define AFTER_RH_62 1
68-#define AFTER_RH_63 1
69-#define AFTER_RH_64 1
70-#define AFTER_RH_65 1
71-#define BEFORE_RH_67 1
72-#define BEFORE_RH_70 1
73-#define BEFORE_RH_71 1
300a759d 74-#define BEFORE_RH_72 1
6986ddb6
JR		 75-#endif
76-#ifdef KERNELVERSION_2_6_32_573
77-#define AFTER_RH_62 1
78-#define AFTER_RH_63 1
79-#define AFTER_RH_64 1
80-#define AFTER_RH_65 1
81-#define AFTER_RH_66 1
82-#define BEFORE_RH_70 1
83-#define BEFORE_RH_71 1
300a759d
JR		 84-#define BEFORE_RH_72 1
85-#endif
86-#ifdef KERNELVERSION_2_6_32_642
87-#define AFTER_RH_62 1
88-#define AFTER_RH_63 1
89-#define AFTER_RH_64 1
90-#define AFTER_RH_65 1
91-#define AFTER_RH_66 1
9752ce8d 92-#define AFTER_RH_67 1
300a759d
JR		 93-#define BEFORE_RH_70 1
94-#define BEFORE_RH_71 1
95-#define BEFORE_RH_72 1
6986ddb6
JR		 96-#endif
97-#ifdef KERNELVERSION_3_10_0_123
98-#define AFTER_RH_62 1
99-#define AFTER_RH_63 1
100-#define AFTER_RH_64 1
101-#define AFTER_RH_65 1
102-#define AFTER_RH_66 1
103-#define AFTER_RH_67 1
104-#define AFTER_RH_6x 1
105-#define BEFORE_RH_71 1
106-#endif
107-#ifdef KERNELVERSION_3_10_0_229
108-#define AFTER_RH_62 1
109-#define AFTER_RH_63 1
110-#define AFTER_RH_64 1
111-#define AFTER_RH_65 1
112-#define AFTER_RH_66 1
113-#define AFTER_RH_67 1
114-#define AFTER_RH_6x 1
115-#define AFTER_RH_70 1
116-#define BEFORE_RH_72 1
117-#endif
118-#ifdef KERNELVERSION_3_10_0_327
9752ce8d
JR		 119-#define AFTER_RH_62 1
120-#define AFTER_RH_63 1
121-#define AFTER_RH_64 1
122-#define AFTER_RH_65 1
123-#define AFTER_RH_66 1
124-#define AFTER_RH_67 1
125-#define AFTER_RH_6x 1
126-#define AFTER_RH_70 1
127-#define AFTER_RH_71 1
128-#endif
129-#ifdef KERNELVERSION_3_10_0_514
6986ddb6
JR		 130 #define AFTER_RH_62 1
131 #define AFTER_RH_63 1
132 #define AFTER_RH_64 1
300a759d 133@@ -126,7 +35,6 @@
6986ddb6 134 #define AFTER_RH_70 1
300a759d 135 #define AFTER_RH_71 1
9752ce8d 136 #define AFTER_RH_72 1
6986ddb6
JR		 137-#endif
138
139 /* Misc defines needed so source is same for all versions of Linux */
140 #ifndef SDEV_TRANSPORT_OFFLINE
300a759d
JR		 141diff -ur lin_tape-3.0.18/sgmp.c lin_tape-3.0.18-ifdefs/sgmp.c
142--- lin_tape-3.0.18/sgmp.c 2017-02-23 19:14:41.000000000 +0100
143+++ lin_tape-3.0.18-ifdefs/sgmp.c 2017-05-09 21:10:20.295643954 +0200
144@@ -262,27 +262,12 @@
6986ddb6
JR		 145 {
146 struct sg_fd *sfp = (struct sg_fd *)filp->private_data;
147
148-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0) && (!defined(SLESVERSION))
149- /* RHEL 7.0 and beyond */
150 struct request_queue *q = sfp->parentdp->device->request_queue;
151-#else
152-#ifdef AFTER_RH_63
153- /* RHEL 6.4+ */
154- struct request_queue *q = sfp->parentdp->device->request_queue;
155-#endif
156-#endif
300a759d 157
6986ddb6
JR		 158 if (sfp->parentdp->device->type == TYPE_SCANNER)
159 return 0;
160
300a759d
JR		 161-#if LINUX_VERSION_CODE > KERNEL_VERSION(3,12,0) || defined(SLESVERSION)
162 return blk_verify_command(cmd, filp->f_mode & FMODE_WRITE);
6986ddb6 163-#else
300a759d 164- /* RHEL 6.4 and beyond */
6986ddb6 165- return blk_verify_command(q, cmd, filp->f_mode & FMODE_WRITE);
6986ddb6 166-#endif
300a759d
JR		 167-//6.3 blk_verify_command(cmd, filp->f_mode & FMODE_WRITE);
168-
6986ddb6
JR		 169 }
170
171 #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,32)
300a759d
JR		 172@@ -419,7 +404,7 @@
173 #endif
174 sdp->sgdebug = 0;
175 q = sdp->device->request_queue;
176-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,32) && (defined(SLESVERSION))
177+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,32)
178 sdp->sg_tablesize = min(queue_max_hw_segments(q),
179 queue_max_phys_segments(q));
180 #else
181@@ -1546,7 +1531,7 @@
6986ddb6
JR		 182 if ((sdp->sgdebug > 0) &&
183 ((CHECK_CONDITION == srp->header.masked_status) ||
184 (COMMAND_TERMINATED == srp->header.masked_status)))
9752ce8d
JR		 185-#if defined(AFTER_RH_71) || LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,21)
186+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,21)
6986ddb6
JR		 187 __scsi_print_sense(sdp->device, "sg_cmd_done", sense, SCSI_SENSE_BUFFERSIZE);
188
189 #else
300a759d
JR		 190@@ -1677,7 +1662,7 @@
191 INIT_LIST_HEAD(&sdp->sfds);
192 init_waitqueue_head(&sdp->o_excl_wait);
193
194-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,32) && (defined(SLESVERSION))
195+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,32)
196 sdp->sg_tablesize = min(queue_max_hw_segments(q),
197 queue_max_phys_segments(q));
198 #else
199@@ -3069,7 +3054,7 @@
200 scsidp->id, scsidp->lun, (int) scsidp->type,
201 1,
202 (int) scsidp->queue_depth,
203-#ifdef AFTER_RH_71
204+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0)
205 (int) atomic_read(&scsidp->device_busy),
206 #else
207 (int) scsidp->device_busy,
208diff -ur lin_tape-3.0.18/stmp.c lin_tape-3.0.18-ifdefs/stmp.c
209--- lin_tape-3.0.18/stmp.c 2017-02-23 19:14:41.000000000 +0100
210+++ lin_tape-3.0.18-ifdefs/stmp.c 2017-05-09 21:11:01.113125428 +0200
211@@ -454,7 +454,7 @@
6986ddb6
JR		 212 SRpnt->cmd[0], SRpnt->cmd[1], SRpnt->cmd[2],
213 SRpnt->cmd[3], SRpnt->cmd[4], SRpnt->cmd[5]);
214 if (cmdstatp->have_sense)
9752ce8d
JR		 215-#if defined(AFTER_RH_70) || LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,21)
216+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,21)
6986ddb6
JR		 217 __scsi_print_sense(STp->device, name, SRpnt->sense, SCSI_SENSE_BUFFERSIZE);
218
219 #else
300a759d 220@@ -475,7 +475,7 @@
6986ddb6
JR		 221 SRpnt->cmd[0] != MODE_SENSE &&
222 SRpnt->cmd[0] != TEST_UNIT_READY) {
9752ce8d
JR		 223
224-#if defined(AFTER_RH_71) || LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,21)
225+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,21)
6986ddb6
JR		 226 __scsi_print_sense(STp->device, name, SRpnt->sense, SCSI_SENSE_BUFFERSIZE);
227
228 #else
300a759d
JR		 229diff -ur lin_tape-3.0.18/upper.c lin_tape-3.0.18-ifdefs/upper.c
230--- lin_tape-3.0.18/upper.c 2017-02-23 19:14:41.000000000 +0100
231+++ lin_tape-3.0.18-ifdefs/upper.c 2017-05-09 21:09:37.868126006 +0200
232@@ -267,7 +267,7 @@
233 if (copy_from_user(pfo_cmd->scsi_cmd, hdr->cmdp, hdr->cmd_len))
234 return -EFAULT;
235
236-#if LINUX_VERSION_CODE > KERNEL_VERSION(3,12,0) || defined(SLESVERSION)
237+#if LINUX_VERSION_CODE > KERNEL_VERSION(3,12,0)
238 if (blk_verify_command(pfo_cmd->scsi_cmd, mode & FMODE_WRITE))
239 #else
240 /* RHEL 6.4 and beyond */
241@@ -608,7 +608,7 @@
242 if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
243 goto error;
244
245-#if LINUX_VERSION_CODE > KERNEL_VERSION(3,12,0) || defined(SLESVERSION)
246+#if LINUX_VERSION_CODE > KERNEL_VERSION(3,12,0)
247 err = blk_verify_command(scsi_cmd, mode & FMODE_WRITE);
248 #else
249 /* RHEL 6.4 and beyond */
IBM Tape SCSI Device Driver for Linux
This page took 0.058027 seconds and 4 git commands to generate.