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

Mike Christie michaelc at cs.wisc.edu
Sat Apr 7 15:44:05 UTC 2012


The following commit has been merged in the upstream-mnc branch:
commit a196ba7372057901c6f9bd231c8b77f963d854f3
Author: Mike Christie <michaelc at cs.wisc.edu>
Date:   Tue Mar 6 03:34:49 2012 -0600

    iscsi tools: fix conn state compilation warnings
    
    Fix compilatin warnings from krecv_conn_state's int state use.

diff --git a/usr/netlink.c b/usr/netlink.c
index 2556f1f..cd1c9db 100644
--- a/usr/netlink.c
+++ b/usr/netlink.c
@@ -1018,7 +1018,7 @@ kset_net_config(uint64_t transport_handle, uint32_t host_no,
 	return 0;
 }
 
-static int krecv_conn_state(struct iscsi_conn *conn, int *state)
+static int krecv_conn_state(struct iscsi_conn *conn, uint32_t *state)
 {
 	int rc;
 
@@ -1269,7 +1269,7 @@ static int ctldev_handle(void)
 	char nlm_ev[NLMSG_SPACE(sizeof(struct iscsi_uevent))];
 	struct nlmsghdr *nlh;
 	struct iscsi_ev_context *ev_context;
-	uint32_t sid = 0, cid = 0, state = 0;
+	uint32_t sid = 0, cid = 0;
 
 	log_debug(7, "in %s", __FUNCTION__);
 
@@ -1315,7 +1315,6 @@ static int ctldev_handle(void)
 	case ISCSI_KEVENT_CONN_LOGIN_STATE:
 		sid = ev->r.conn_login.sid;
 		cid = ev->r.conn_login.cid;
-		state = ev->r.conn_login.state;
 		break;
 	case ISCSI_KEVENT_UNBIND_SESSION:
 		sid = ev->r.unbind_session.sid;

-- 
Debian Open-iSCSI Packaging



More information about the Pkg-iscsi-maintainers mailing list