- fix building against 5.10 and 5.12

[packages/lin_tape.git] / kernel-5.12.patch

diff -ur lin_tape-3.0.56/lin_tape_ioctl_tape.c lin_tape-3.0.56-5.12/lin_tape_ioctl_tape.c
--- lin_tape-3.0.56/lin_tape_ioctl_tape.c	2020-12-07 05:40:22.000000000 +0100
+++ lin_tape-3.0.56-5.12/lin_tape_ioctl_tape.c	2021-05-03 22:15:51.643418382 +0200
@@ -6552,7 +6552,11 @@
 	srq->retries = 0;
 #endif
 	req->timeout = timeout;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,12,0)
 	blk_execute_rq(req->q, NULL, req, 1);
+#else
+	blk_execute_rq(NULL, req, 1);
+#endif
 #if LINUX_VERSION_CODE <= KERNEL_VERSION(4,11,0)
 	*resid = req->resid_len;
 	status_code = req->errors;
diff -ur lin_tape-3.0.56/lin_tape_scsi_config.h lin_tape-3.0.56-5.12/lin_tape_scsi_config.h
--- lin_tape-3.0.56/lin_tape_scsi_config.h	2021-05-03 22:17:53.707525951 +0200
+++ lin_tape-3.0.56-5.12/lin_tape_scsi_config.h	2021-05-03 22:16:45.960370794 +0200
@@ -60,8 +60,6 @@
 MODULE_AUTHOR("IBM Corporation");
 MODULE_DESCRIPTION
     ("IBM Linux SCSI Tape Device Driver for IBM and other vendor Tape Devices");
-MODULE_SUPPORTED_DEVICE
-    ("IBM Tape Drives and Libraries");
 MODULE_LICENSE("GPL");
 MODULE_VERSION("3.0.56");
 /* driver parameters */
diff -ur lin_tape-3.0.56/lower.c lin_tape-3.0.56-5.12/lower.c
--- lin_tape-3.0.56/lower.c	2020-12-07 05:40:22.000000000 +0100
+++ lin_tape-3.0.56-5.12/lower.c	2021-05-03 22:17:26.597339365 +0200
@@ -541,7 +541,11 @@
 	rq->timeout = pfo_cmd->timeout;
 	rq->end_io_data = pfo_cmd;
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,12,0)
 	blk_execute_rq(rq->q, NULL, rq, 1);
+#else
+	blk_execute_rq(NULL, rq, 1);
+#endif
 
 	if (bio && (pfo_cmd->source != PFO_SOURCE_CMD_1) &&
 		   (pfo_cmd->source != PFO_SOURCE_EXEC)) {