mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-08-18 05:06:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

scst: Port to Linux kernel v5.17

Browse Source
This commit is contained in:
Gleb Chesnokov
2022-01-24 22:28:43 +03:00
parent 36d3aa0fbf
commit 1b0d3562f0
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scst/include/backport.h
+15 -6
View File
@@ -130,15 +130,24 @@ static inline unsigned int scst_blk_rq_cpu(struct request *rq)
#endif
}
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 12, 0)
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0)
/*
* See also commit 8eeed0b554b9 ("block: remove unnecessary argument from
* blk_execute_rq_nowait") # v5.12.
* See also commit b84ba30b6c7a ("block: remove the gendisk argument to
* blk_execute_rq") # v5.17.
*/
static inline void blk_execute_rq_nowait_backport(struct gendisk *bd_disk,
struct request *rq, int at_head, rq_end_io_fn *done)
static inline
void blk_execute_rq_nowait_backport(struct request *rq, bool at_head,
rq_end_io_fn *done)
{
blk_execute_rq_nowait(rq->q, bd_disk, rq, at_head, done);
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 12, 0)
/*
* See also commit 8eeed0b554b9 ("block: remove unnecessary argument from
* blk_execute_rq_nowait") # v5.12.
*/
blk_execute_rq_nowait(rq->q, NULL, rq, at_head, done);
#else
blk_execute_rq_nowait(NULL, rq, at_head, done);
#endif
}
#define blk_execute_rq_nowait blk_execute_rq_nowait_backport
scst/src/scst_lib.c
+1 -1
View File
@@ -8618,7 +8618,7 @@ int scst_scsi_exec_async(struct scst_cmd *cmd, void *data,
rq->end_io_data = sioc;
rq->cmd_flags |= REQ_FAILFAST_MASK;
blk_execute_rq_nowait(NULL, rq,
blk_execute_rq_nowait(rq,
(cmd->queue_type == SCST_CMD_QUEUE_HEAD_OF_QUEUE), scsi_end_async);
out:
return res;