From 03c8f6fcd7396b530d33859a8ae1d71ba07cf5bb Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Fri, 8 Apr 2011 17:50:39 +0000 Subject: [PATCH] Fix compilations problems with gcc 4.6 reported by Bart Van Assche git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@3367 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/include/scst.h | 4 ++-- scst/src/scst_sysfs.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scst/include/scst.h b/scst/include/scst.h index b3daed55f..bbdec2023 100644 --- a/scst/include/scst.h +++ b/scst/include/scst.h @@ -4046,8 +4046,8 @@ struct scst_sysfs_work_item { }; struct scst_session *sess; struct { - struct scst_tgt *tgt; - unsigned long l; + struct scst_tgt *tgt_r; + unsigned long rel_tgt_id; }; }; int work_res; diff --git a/scst/src/scst_sysfs.c b/scst/src/scst_sysfs.c index 2c6688b4d..26a648f38 100644 --- a/scst/src/scst_sysfs.c +++ b/scst/src/scst_sysfs.c @@ -2112,8 +2112,8 @@ static ssize_t scst_rel_tgt_id_show(struct kobject *kobj, static int scst_process_rel_tgt_id_store(struct scst_sysfs_work_item *work) { int res = 0; - struct scst_tgt *tgt = work->tgt; - unsigned long rel_tgt_id = work->l; + struct scst_tgt *tgt = work->tgt_r; + unsigned long rel_tgt_id = work->rel_tgt_id; TRACE_ENTRY(); @@ -2180,8 +2180,8 @@ static ssize_t scst_rel_tgt_id_store(struct kobject *kobj, if (res != 0) goto out; - work->tgt = tgt; - work->l = rel_tgt_id; + work->tgt_r = tgt; + work->rel_tgt_id = rel_tgt_id; kobject_get(&tgt->tgt_kobj);