From 3530dfa6990f1bc31dabc8b44d3cf73fe7f98dd4 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sat, 5 Oct 2013 18:27:27 +0000 Subject: [PATCH] Make qla2x00t cleanly compile on RHEL 6.2 (merge r4303 from trunk) git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/2.2.x@5046 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- qla2x00t/qla_attr.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/qla2x00t/qla_attr.c b/qla2x00t/qla_attr.c index 65a2319c7..2da152420 100644 --- a/qla2x00t/qla_attr.c +++ b/qla2x00t/qla_attr.c @@ -1100,7 +1100,14 @@ qla2x00_wait_for_passthru_completion(struct scsi_qla_host *ha) } static ssize_t -qla2x00_sysfs_read_ct(struct kobject *kobj, +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) && \ + (!defined(RHEL_RELEASE_CODE) || \ + RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(6, 2)) +qla2x00_sysfs_read_ct( +#else +qla2x00_sysfs_read_ct(struct file *file, +#endif + struct kobject *kobj, struct bin_attribute *bin_attr, char *buf, loff_t off, size_t count) @@ -1123,7 +1130,14 @@ qla2x00_sysfs_read_ct(struct kobject *kobj, } static ssize_t -qla2x00_sysfs_write_ct(struct kobject *kobj, +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) && \ + (!defined(RHEL_RELEASE_CODE) || \ + RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(6, 2)) +qla2x00_sysfs_write_ct( +#else +qla2x00_sysfs_write_ct(struct file *file, +#endif + struct kobject *kobj, struct bin_attribute *bin_attr, char *buf, loff_t off, size_t count)