From b3ca5afd06df5c70e35e3820a95de8e7efe617eb Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Wed, 2 May 2012 18:42:30 +0000 Subject: [PATCH] Cleanup and compile fix for breakage reported by Bart Van Assche git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@4272 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/src/dev_handlers/scst_vdisk.c | 1 - scst/src/scst_lib.c | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/scst/src/dev_handlers/scst_vdisk.c b/scst/src/dev_handlers/scst_vdisk.c index afd67648d..43bee0cc4 100644 --- a/scst/src/dev_handlers/scst_vdisk.c +++ b/scst/src/dev_handlers/scst_vdisk.c @@ -941,7 +941,6 @@ static int vdisk_attach_tgt(struct scst_tgt_dev *tgt_dev) virt_dev->fd = NULL; out: - TRACE_EXIT_RES(res); return res; } diff --git a/scst/src/scst_lib.c b/scst/src/scst_lib.c index 3963ab76e..5d9b87a18 100644 --- a/scst/src/scst_lib.c +++ b/scst/src/scst_lib.c @@ -67,6 +67,12 @@ static int strncasecmp(const char *s1, const char *s2, size_t n) } #endif +#if !((LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)) && defined(SCSI_EXEC_REQ_FIFO_DEFINED)) && !defined(HAVE_SG_COPY) +static int sg_copy(struct scatterlist *dst_sg, struct scatterlist *src_sg, + int nents_to_copy, size_t copy_len, + enum km_type d_km_type, enum km_type s_km_type); +#endif + static void scst_destroy_put_cmd(struct scst_cmd *cmd); struct scst_sdbops;