[Pkg-iscsi-maintainers] [SCM] Debian Open-iSCSI Packaging branch, upstream-mnc, updated. 2.0-872-101-g2616afb

[Mike Christie]

The following commit has been merged in the upstream-mnc branch:
commit c5b55bb18f1be03a2214013d0350190d3040f56c
Author: Mike Christie <michaelc at cs.wisc.edu>
Date:   Thu Feb 10 01:17:35 2011 -0600

    iscsiadm: fix offload discovery retry
    
    If iscsiadm offload discovery ep_disconnect failed
    we did not clean up the netlink resrouces due to
    using the incorrect goto label.

diff --git a/usr/discovery.c b/usr/discovery.c
index dc3ec8b..742334f 100644
--- a/usr/discovery.c
+++ b/usr/discovery.c
@@ -1109,7 +1109,7 @@ static int iscsi_create_leading_conn(struct iscsi_session *session)
 	rc = t->template->ep_connect(conn, 1);
 	if (rc < 0) {
 		rc = ISCSI_ERR_TRANS;
-		goto fail;
+		goto close_ipc;
 	}
 
 	do {
@@ -1187,7 +1187,7 @@ close_ipc:
 		ipc->ctldev_close();
 		conn->socket_fd = -1;
 	}
-fail:
+
 	log_error("Connection to discovery portal %s failed: %s",
 		  conn->host, iscsi_err_to_str(rc));
 	return rc;

-- 
Debian Open-iSCSI Packaging