From 22610b42dea26f17d9be3f5bd23fed0f32436932 Mon Sep 17 00:00:00 2001 From: Mike Christie Date: Fri, 19 Feb 2010 19:19:22 -0600 Subject: iscsi tools: use open-isns services This replaces the native isns code with open-isns's libisns. I included the open-isns code in the open-iscsi tarball to make distribution easier since some distros use different isns clients and may not want to carry open-isns. This is based on open-isns commit 5e09f36d3446e41de0b8361601ffec4cd140d513. Changes in iSNS behavior/use: - To do discovery you must pass the ip and optionally the port to iscsiadm: iscsiadm -m discovery -t st -p 10.15.0.9 This command accepts the same ops as sendtargets so you can add/remove/update the node records that are created. It also supports ifaces properly now. - isns.address and isns.port in iscsid.conf are no longer used. - ESI is temporarily not supported. This will be fixed in the next patch when SCNs support is added. - The iscsiadm isns discovery command is not marked as stable. Signed-off-by: Mike Christie --- include/list.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/list.h b/include/list.h index bbf3425..a59ca00 100644 --- a/include/list.h +++ b/include/list.h @@ -11,7 +11,7 @@ #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) #endif -#define container_of(ptr, type, member) ({ \ +#define list_container_of(ptr, type, member) ({ \ const typeof( ((type *)0)->member ) *__mptr = (ptr); \ (type *)( (char *)__mptr - offsetof(type,member) );}) @@ -36,7 +36,7 @@ static inline int list_empty(const struct list_head *head) } #define list_entry(ptr, type, member) \ - container_of(ptr, type, member) + list_container_of(ptr, type, member) #define list_for_each(pos, head) \ for (pos = (head)->next; pos != (head); pos = pos->next) -- cgit v1.2.1