From d663c8d47d3eff3ab7dc665e1ca764f31bf75d1e Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Mon, 13 Feb 2012 19:23:52 +0000 Subject: [PATCH] SCST core and iSCSI-SCST: Port to RHEL / CentOS / SL 5.7 (merged r4111 and r4112 from trunk) git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/2.2.x@4126 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- iscsi-scst/kernel/target.c | 3 ++- scst/src/scst_proc.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/iscsi-scst/kernel/target.c b/iscsi-scst/kernel/target.c index ffe11cfc1..2f7d23ca9 100644 --- a/iscsi-scst/kernel/target.c +++ b/iscsi-scst/kernel/target.c @@ -382,7 +382,8 @@ void target_del_all(void) #ifdef CONFIG_SCST_PROC -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19) && \ + (!defined(RHEL_MAJOR) || RHEL_MAJOR -0 <= 5 && RHEL_MINOR -0 <= 6) static struct list_head *seq_list_start(struct list_head *head, loff_t pos) { struct list_head *lh; diff --git a/scst/src/scst_proc.c b/scst/src/scst_proc.c index fc3860f19..26043cca1 100644 --- a/scst/src/scst_proc.c +++ b/scst/src/scst_proc.c @@ -2746,7 +2746,8 @@ EXPORT_SYMBOL_GPL(scst_create_proc_entry); int scst_single_seq_open(struct inode *inode, struct file *file) { -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 23) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 23) \ + || defined(RHEL_MAJOR) && RHEL_MAJOR -0 >= 5 && RHEL_MINOR -0 >= 7 struct scst_proc_data *pdata = container_of(PDE(inode)->proc_fops, struct scst_proc_data, seq_op); #else