1 --- lin_tape-3.0.33/lin_tape_ioctl_tape.c~ 2019-03-10 18:06:13.000000000 +0100
2 +++ lin_tape-3.0.33/lin_tape_ioctl_tape.c 2019-03-10 18:11:48.544963300 +0100
4 #include "lin_tape_timeout_tape.h"
5 #include "ibmekm/inc/dd_event.h"
6 #include "lin_tape_scsi_tape.h"
7 +#include <linux/ktime.h>
9 /*****************************************************************************
11 @@ -2825,7 +2826,16 @@
12 if(rc != STATUS_SUCCESS) goto EXIT_LABEL;
14 memset(tv, '\0', sizeof(struct timeval));
15 +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)
18 + struct timespec64 __now__;
20 + ktime_get_real_ts64(&__now__);
22 + tv->tv_sec = __now__.tv_sec,
23 + tv->tv_usec = __now__.tv_nsec/1000,
26 /* tv.sec in structure timeval is a "long" integer
27 * it has 4 bytes in 32-bit kernel, but 8 bytes in 64-bit kernel
28 @@ -8843,7 +8853,16 @@
30 /* get time info to set TOD */
31 memset(tv, '\0', sizeof(struct timeval));
32 +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)
35 + struct timespec64 __now__;
37 + ktime_get_real_ts64(&__now__);
39 + tv->tv_sec = __now__.tv_sec,
40 + tv->tv_usec = __now__.tv_nsec/1000,
43 /* tv.sec in structure timeval is a "long" integer
44 * it has 4 bytes in 32-bit kernel, but 8 bytes in 64-bit kernel
45 --- lin_tape-3.0.33/intercept.c~ 2019-03-10 18:13:48.000000000 +0100
46 +++ lin_tape-3.0.33/intercept.c 2019-03-10 18:16:23.483059816 +0100
48 /* Only for fo devices */
49 /* This 'if' must match the one above in create unique */
50 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)
51 - #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,17,0)
52 + #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,17,0) && LINUX_VERSION_CODE < KERNEL_VERSION(5,0,0)
53 sdev->request_queue = blk_alloc_queue_node(GFP_KERNEL, NUMA_NO_NODE, NULL);
55 sdev->request_queue = blk_alloc_queue_node(GFP_KERNEL, NUMA_NO_NODE);