From 7311aeced334ed82c9e30e7acc8f00ff42d2b877 Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Wed, 27 Apr 2011 23:29:46 +0000 Subject: [PATCH] Follow up commit for r3422 git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@3423 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- qla2x00t/qla2x_tgt_def.h | 2 +- qla2x00t/qla_attr.c | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/qla2x00t/qla2x_tgt_def.h b/qla2x00t/qla2x_tgt_def.h index 889c1945a..b13564cee 100644 --- a/qla2x00t/qla2x_tgt_def.h +++ b/qla2x00t/qla2x_tgt_def.h @@ -51,7 +51,7 @@ * Must be changed on any change in any target visible interfaces or * data in the initiator */ -#define QLA2X_INITIATOR_MAGIC 57224 +#define QLA2X_INITIATOR_MAGIC 57225 #define QLA2X_INI_MODE_STR_EXCLUSIVE "exclusive" #define QLA2X_INI_MODE_STR_DISABLED "disabled" diff --git a/qla2x00t/qla_attr.c b/qla2x00t/qla_attr.c index c09494651..3509604d7 100644 --- a/qla2x00t/qla_attr.c +++ b/qla2x00t/qla_attr.c @@ -1073,7 +1073,12 @@ 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) +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) @@ -1096,7 +1101,12 @@ 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) +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)