From d2e17ff514551a5652167585d9d5efb3b81de7b1 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 17 Dec 2015 15:09:48 +0000 Subject: [PATCH] iscsi-scst, procfs: Fix a compiler warning (merge r6742 from trunk) git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.1.x@6750 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- iscsi-scst/kernel/target.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/iscsi-scst/kernel/target.c b/iscsi-scst/kernel/target.c index 7a3e0a546..b246e0d7a 100644 --- a/iscsi-scst/kernel/target.c +++ b/iscsi-scst/kernel/target.c @@ -128,7 +128,6 @@ int __add_target(struct iscsi_kern_target_info *info) int err; u32 tid = info->tid; struct iscsi_target *target = NULL; /* to calm down sparse */ - struct iscsi_kern_attr *attr_info; union add_info_union { struct iscsi_kern_params_info params_info; struct iscsi_kern_attr attr_info; @@ -165,7 +164,6 @@ int __add_target(struct iscsi_kern_target_info *info) err = -ENOMEM; goto out; } - attr_info = (struct iscsi_kern_attr *)add_info; if (tid == 0) { do { @@ -183,6 +181,9 @@ int __add_target(struct iscsi_kern_target_info *info) nr_targets++; #ifndef CONFIG_SCST_PROC + { + struct iscsi_kern_attr *attr_info = &add_info->attr_info; + mutex_lock(&target->target_mutex); attrs_ptr_long = info->attrs_ptr; @@ -208,6 +209,7 @@ int __add_target(struct iscsi_kern_target_info *info) } mutex_unlock(&target->target_mutex); + } #endif err = tid;