mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-09-21 07:24:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

scst: Remove the code that depends on the SCSI_EXEC_REQ_FIFO_DEFINED macro

Browse Source 
The exec_req_fifo patches have been removed some time ago. Hence also remove
the code that depends on these patches having been applied. See also commit
78d6da4517 ("scst: Remove obsolete exec_req_fifo kernel patches"; r8022).



git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8698 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2019-12-23 18:55:58 +00:00
parent 6fde88d57b
commit 5ca9d97b65
5 changed files with 5 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scst/src/scst_lib.c
-5
View File
@@ -147,8 +147,6 @@ int hex_to_bin(char ch)
EXPORT_SYMBOL(hex_to_bin);
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30) || \
!defined(SCSI_EXEC_REQ_FIFO_DEFINED)
static int sg_copy(struct scatterlist *dst_sg, struct scatterlist *src_sg,
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)
int nents_to_copy, size_t copy_len,
@@ -156,7 +154,6 @@ static int sg_copy(struct scatterlist *dst_sg, struct scatterlist *src_sg,
#else
int nents_to_copy, size_t copy_len);
#endif
#endif
static void scst_free_descriptors(struct scst_cmd *cmd);
static bool sg_cmp(struct scatterlist *dst_sg, struct scatterlist *src_sg,
@@ -8393,7 +8390,6 @@ out:
}
#endif
#if !defined(SCSI_EXEC_REQ_FIFO_DEFINED)
/*
* Can switch to the next dst_sg element, so, to copy to strictly only
* one dst_sg element, it must be either last in the chain, or
@@ -8545,7 +8541,6 @@ static int sg_copy(struct scatterlist *dst_sg, struct scatterlist *src_sg,
out:
return res;
}
#endif /* !defined(SCSI_EXEC_REQ_FIFO_DEFINED) */
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 13, 0) && \
scst/src/scst_main.c
+1 -4
View File
@@ -48,10 +48,8 @@ details.
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30) && \
!defined(SCSI_EXEC_REQ_FIFO_DEFINED) && \
!defined(CONFIG_SCST_STRICT_SERIALIZING)
#warning Patch scst_exec_req_fifo-<kernel-version> was not applied on \
your kernel and CONFIG_SCST_STRICT_SERIALIZING is not defined. \
#warning CONFIG_SCST_STRICT_SERIALIZING has not been defined. \
Pass-through dev handlers will not work.
#endif
@@ -1538,7 +1536,6 @@ int __scst_register_dev_driver(struct scst_dev_type *dev_type,
goto out;
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30) && \
!defined(SCSI_EXEC_REQ_FIFO_DEFINED) && \
!defined(CONFIG_SCST_STRICT_SERIALIZING)
if (dev_type->exec == NULL) {
PRINT_ERROR("Pass-through dev handlers (handler \"%s\") not "
scst/src/scst_priv.h
+1 -4
View File
@@ -457,12 +457,9 @@ static inline int scst_exec_req(struct scsi_device *sdev,
#if defined(CONFIG_SCST_STRICT_SERIALIZING)
return scsi_execute_async(sdev, cmd, cmd_len, data_direction, (void *)sgl,
bufflen, nents, timeout, retries, privdata, done, gfp);
#elif !defined(SCSI_EXEC_REQ_FIFO_DEFINED)
#else
WARN_ON(1);
return -1;
#else
return scsi_execute_async_fifo(sdev, cmd, cmd_len, data_direction,
(void *)sgl, bufflen, nents, timeout, retries, privdata, done, gfp);
#endif
}
#endif