]>
Commit | Line | Data |
---|---|---|
e816b7a7 JR |
1 | diff -ur lin_tape-3.0.56/lin_tape_ioctl_tape.c lin_tape-3.0.56-5.12/lin_tape_ioctl_tape.c |
2 | --- lin_tape-3.0.56/lin_tape_ioctl_tape.c 2020-12-07 05:40:22.000000000 +0100 | |
3 | +++ lin_tape-3.0.56-5.12/lin_tape_ioctl_tape.c 2021-05-03 22:15:51.643418382 +0200 | |
4 | @@ -6552,7 +6552,11 @@ | |
5 | srq->retries = 0; | |
6 | #endif | |
7 | req->timeout = timeout; | |
efe9d60c | 8 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(5,10,0) |
e816b7a7 JR |
9 | blk_execute_rq(req->q, NULL, req, 1); |
10 | +#else | |
11 | + blk_execute_rq(NULL, req, 1); | |
12 | +#endif | |
13 | #if LINUX_VERSION_CODE <= KERNEL_VERSION(4,11,0) | |
14 | *resid = req->resid_len; | |
15 | status_code = req->errors; | |
16 | diff -ur lin_tape-3.0.56/lin_tape_scsi_config.h lin_tape-3.0.56-5.12/lin_tape_scsi_config.h | |
17 | --- lin_tape-3.0.56/lin_tape_scsi_config.h 2021-05-03 22:17:53.707525951 +0200 | |
18 | +++ lin_tape-3.0.56-5.12/lin_tape_scsi_config.h 2021-05-03 22:16:45.960370794 +0200 | |
19 | @@ -60,8 +60,6 @@ | |
20 | MODULE_AUTHOR("IBM Corporation"); | |
21 | MODULE_DESCRIPTION | |
22 | ("IBM Linux SCSI Tape Device Driver for IBM and other vendor Tape Devices"); | |
23 | -MODULE_SUPPORTED_DEVICE | |
24 | - ("IBM Tape Drives and Libraries"); | |
25 | MODULE_LICENSE("GPL"); | |
26 | MODULE_VERSION("3.0.56"); | |
27 | /* driver parameters */ | |
28 | @@ -220,6 +218,7 @@ | |
29 | { | |
30 | return single_open(file, tape_read_proc, NULL); | |
31 | } | |
efe9d60c | 32 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(5,10,0) |
e816b7a7 JR |
33 | static struct file_operations tape_proc_ops = { |
34 | .owner = THIS_MODULE, | |
35 | .open = tape_open_proc, | |
36 | @@ -227,6 +226,14 @@ | |
37 | .llseek = seq_lseek, | |
38 | .release = single_release, | |
39 | }; | |
40 | +#else | |
41 | +static struct proc_ops tape_proc_ops = { | |
42 | + .proc_open = tape_open_proc, | |
43 | + .proc_read = seq_read, | |
44 | + .proc_lseek = seq_lseek, | |
45 | + .proc_release = single_release, | |
46 | +}; | |
47 | +#endif | |
48 | #endif | |
49 | ||
50 | int rd_pc_initial | |
51 | @@ -252,6 +259,7 @@ | |
52 | { | |
53 | return single_open(file, changer_read_proc, NULL); | |
54 | } | |
efe9d60c | 55 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(5,10,0) |
e816b7a7 JR |
56 | static struct file_operations changer_proc_ops = { |
57 | .owner = THIS_MODULE, | |
58 | .open = changer_open_proc, | |
59 | @@ -259,6 +267,14 @@ | |
60 | .llseek = seq_lseek, | |
61 | .release = single_release, | |
62 | }; | |
63 | +#else | |
64 | +static struct proc_ops changer_proc_ops = { | |
65 | + .proc_open = changer_open_proc, | |
66 | + .proc_read = seq_read, | |
67 | + .proc_lseek = seq_lseek, | |
68 | + .proc_release = single_release, | |
69 | +}; | |
70 | +#endif | |
71 | #endif | |
72 | ||
73 | static int status_read_proc | |
74 | @@ -270,6 +286,7 @@ | |
75 | { | |
76 | return single_open(file, status_read_proc, NULL); | |
77 | } | |
efe9d60c | 78 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(5,10,0) |
e816b7a7 JR |
79 | static struct file_operations status_proc_ops = { |
80 | .owner = THIS_MODULE, | |
81 | .open = status_open_proc, | |
82 | @@ -277,6 +294,14 @@ | |
83 | .llseek = seq_lseek, | |
84 | .release = single_release, | |
85 | }; | |
86 | +#else | |
87 | +static struct proc_ops status_proc_ops = { | |
88 | + .proc_open = status_open_proc, | |
89 | + .proc_read = seq_read, | |
90 | + .proc_lseek = seq_lseek, | |
91 | + .proc_release = single_release, | |
92 | +}; | |
93 | +#endif | |
94 | #endif | |
95 | ||
96 | int rdstatus_pc_initial | |
97 | diff -ur lin_tape-3.0.56/lower.c lin_tape-3.0.56-5.12/lower.c | |
98 | --- lin_tape-3.0.56/lower.c 2020-12-07 05:40:22.000000000 +0100 | |
99 | +++ lin_tape-3.0.56-5.12/lower.c 2021-05-03 22:17:26.597339365 +0200 | |
100 | @@ -541,7 +541,11 @@ | |
101 | rq->timeout = pfo_cmd->timeout; | |
102 | rq->end_io_data = pfo_cmd; | |
103 | ||
efe9d60c | 104 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(5,10,0) |
e816b7a7 JR |
105 | blk_execute_rq(rq->q, NULL, rq, 1); |
106 | +#else | |
107 | + blk_execute_rq(NULL, rq, 1); | |
108 | +#endif | |
109 | ||
110 | if (bio && (pfo_cmd->source != PFO_SOURCE_CMD_1) && | |
111 | (pfo_cmd->source != PFO_SOURCE_EXEC)) { |