[stgt] [PATCH 1/2] Remove function isns_deregister()

Chandra Seetharaman sekharan at us.ibm.com
Wed Aug 4 03:17:35 CEST 2010


Function isns_deregister() is called from isns_exit() to deregister the 
target from SNS server, and currently isns_exit() is not called.

This function is not necessary as target deregister from iSNS server
happens in isns_target_deregister(),

This patch is in preparation of the following patch to allow 
turning iSNS on/Off.

Signed-Off-By: Chandra Seetharaman <sekharan at us.ibm.com>
---
 usr/iscsi/isns.c |   39 ---------------------------------------
 1 file changed, 39 deletions(-)

Index: tgt-469b574/usr/iscsi/isns.c
===================================================================
--- tgt-469b574.orig/usr/iscsi/isns.c
+++ tgt-469b574/usr/iscsi/isns.c
@@ -337,43 +337,6 @@ static int isns_attr_query(char *name)
 	return 0;
 }
 
-static int isns_deregister(void)
-{
-	int err;
-	uint16_t flags, length = 0;
-	char buf[4096], *name;
-	struct isns_hdr *hdr = (struct isns_hdr *) buf;
-	struct isns_tlv *tlv;
-	struct iscsi_target *target;
-
-	if (list_empty(&iscsi_targets_list))
-		return 0;
-
-	if (!isns_fd)
-		if (isns_connect() < 0)
-			return 0;
-
-	memset(buf, 0, sizeof(buf));
-	tlv = (struct isns_tlv *) hdr->pdu;
-
-	target = list_first_entry(&iscsi_targets_list,
-				  struct iscsi_target, tlist);
-	name = tgt_targetname(target->tid);
-
-	length += isns_tlv_set_string(&tlv, ISNS_ATTR_ISCSI_NAME, name);
-	length += isns_tlv_set(&tlv, 0, 0, 0);
-	length += isns_tlv_set_string(&tlv, ISNS_ATTR_ENTITY_IDENTIFIER, eid);
-
-	flags = ISNS_FLAG_CLIENT | ISNS_FLAG_LAST_PDU | ISNS_FLAG_FIRST_PDU;
-	isns_hdr_init(hdr, ISNS_FUNC_DEV_DEREG, length, flags,
-		      ++transaction, 0);
-
-	err = write(isns_fd, buf, length + sizeof(struct isns_hdr));
-	if (err < 0)
-		eprintf("%d %m\n", length);
-	return 0;
-}
-
 int isns_target_register(char *name)
 {
 	char buf[4096];
@@ -941,8 +904,6 @@ void isns_exit(void)
 	list_for_each_entry(target, &iscsi_targets_list, tlist)
 		isns_scn_deregister(tgt_targetname(target->tid));
 
-	isns_deregister();
-
 	if (isns_fd) {
 		tgt_event_del(isns_fd);
 		close(isns_fd);
--
To unsubscribe from this list: send the line "unsubscribe stgt" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html



More information about the stgt mailing list