]> git.pld-linux.org Git - packages/lin_tape.git/blob - kernel-5.12.patch
- fix building against 5.10 and 5.12
[packages/lin_tape.git] / kernel-5.12.patch
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;
8 +#if LINUX_VERSION_CODE < KERNEL_VERSION(5,12,0)
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 diff -ur lin_tape-3.0.56/lower.c lin_tape-3.0.56-5.12/lower.c
29 --- lin_tape-3.0.56/lower.c     2020-12-07 05:40:22.000000000 +0100
30 +++ lin_tape-3.0.56-5.12/lower.c        2021-05-03 22:17:26.597339365 +0200
31 @@ -541,7 +541,11 @@
32         rq->timeout = pfo_cmd->timeout;
33         rq->end_io_data = pfo_cmd;
34  
35 +#if LINUX_VERSION_CODE < KERNEL_VERSION(5,12,0)
36         blk_execute_rq(rq->q, NULL, rq, 1);
37 +#else
38 +       blk_execute_rq(NULL, rq, 1);
39 +#endif
40  
41         if (bio && (pfo_cmd->source != PFO_SOURCE_CMD_1) &&
42                    (pfo_cmd->source != PFO_SOURCE_EXEC)) {
This page took 0.052746 seconds and 3 git commands to generate.