From da19cd6eccec1be82c16c21b0c146003c60812db Mon Sep 17 00:00:00 2001
From: Vladislav Bolkhovitin <vst@vlnb.net>
Date: Tue, 28 Jan 2014 22:07:45 +0000
Subject: [PATCH] Small cleanups

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/iser@5243 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 iscsi-scst/include/iscsit_transport.h | 6 ++++--
 iscsi-scst/kernel/iscsit_transport.c  | 8 ++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/iscsi-scst/include/iscsit_transport.h b/iscsi-scst/include/iscsit_transport.h
index e4e5ff870..32afb08bd 100644
--- a/iscsi-scst/include/iscsit_transport.h
+++ b/iscsi-scst/include/iscsit_transport.h
@@ -11,7 +11,7 @@
 #include <scst.h>
 #endif
 
-/* forward declarations */
+/* Forward declarations */
 struct iscsi_session;
 struct iscsi_kern_conn_info;
 struct iscsi_conn;
@@ -49,12 +49,14 @@ struct iscsit_transport {
 	int (*iscsit_receive_cmnd_data)(struct iscsi_cmnd *cmnd);
 	void (*iscsit_close_all_portals)(void);
 
+#if !defined(CONFIG_TCP_ZERO_COPY_TRANSFER_COMPLETION_NOTIFICATION)
 	unsigned int need_alloc_write_buf:1;
+#endif
 
 	struct module *owner;
 	const char name[SCST_MAX_NAME];
 	enum iscsit_transport_type transport_type;
-	struct list_head list;
+	struct list_head transport_list_entry;
 };
 
 extern int iscsit_register_transport(struct iscsit_transport *t);
diff --git a/iscsi-scst/kernel/iscsit_transport.c b/iscsi-scst/kernel/iscsit_transport.c
index debf87edb..d913e3889 100644
--- a/iscsi-scst/kernel/iscsit_transport.c
+++ b/iscsi-scst/kernel/iscsit_transport.c
@@ -10,7 +10,7 @@ static struct iscsit_transport *__iscsit_get_transport(enum iscsit_transport_typ
 {
 	struct iscsit_transport *t;
 
-	list_for_each_entry(t, &transport_list, list) {
+	list_for_each_entry(t, &transport_list, transport_list_entry) {
 		if (t->transport_type == type)
 			return t;
 	}
@@ -34,7 +34,7 @@ int iscsit_register_transport(struct iscsit_transport *t)
 	struct iscsit_transport *tmp;
 	int ret = 0;
 
-	INIT_LIST_HEAD(&t->list);
+	INIT_LIST_HEAD(&t->transport_list_entry);
 
 	mutex_lock(&transport_mutex);
 	tmp = __iscsit_get_transport(t->transport_type);
@@ -43,7 +43,7 @@ int iscsit_register_transport(struct iscsit_transport *t)
 			    t->transport_type);
 		ret = -EEXIST;
 	} else {
-		list_add_tail(&t->list, &transport_list);
+		list_add_tail(&t->transport_list_entry, &transport_list);
 		PRINT_INFO("Registered iSCSI transport: %s\n", t->name);
 	}
 	mutex_unlock(&transport_mutex);
@@ -55,7 +55,7 @@ EXPORT_SYMBOL(iscsit_register_transport);
 void iscsit_unregister_transport(struct iscsit_transport *t)
 {
 	mutex_lock(&transport_mutex);
-	list_del(&t->list);
+	list_del(&t->transport_list_entry);
 	mutex_unlock(&transport_mutex);
 
 	PRINT_INFO("Unregistered iSCSI transport: %s\n", t->name);