mchristi e81a583
diff -aurp open-iscsi-2.0-872-rc1-bnx2i/usr/log.c open-iscsi-2.0-872-rc1-bnx2i.work/usr/log.c
mchristi e81a583
--- open-iscsi-2.0-872-rc1-bnx2i/usr/log.c	2010-05-06 15:26:01.000000000 -0500
mchristi e81a583
+++ open-iscsi-2.0-872-rc1-bnx2i.work/usr/log.c	2010-05-06 15:51:47.000000000 -0500
mchristi e81a583
@@ -281,10 +281,15 @@ void log_do_log_daemon(int prio, void *p
mchristi e81a583
 
mchristi e81a583
 void log_do_log_stderr(int prio, void *priv, const char *fmt, va_list ap)
mchristi e81a583
 {
mchristi e81a583
-	fprintf(stderr, "%s: ", log_name);
mchristi e81a583
-	vfprintf(stderr, fmt, ap);
mchristi e81a583
-	fprintf(stderr, "\n");
mchristi e81a583
-	fflush(stderr);
mchristi e81a583
+	if (prio == LOG_INFO) {
mchristi e81a583
+		vfprintf(stdout, fmt, ap);
mchristi e81a583
+		fprintf(stdout, "\n");
mchristi e81a583
+	} else {
mchristi e81a583
+		fprintf(stderr, "%s: ", log_name);
mchristi e81a583
+		vfprintf(stderr, fmt, ap);
mchristi e81a583
+		fprintf(stderr, "\n");
mchristi e81a583
+		fflush(stderr);
mchristi e81a583
+	}
mchristi e81a583
 }
mchristi e81a583
 
mchristi e81a583
 void log_warning(const char *fmt, ...)
mchristi e81a583
@@ -313,6 +318,14 @@ void log_debug(int level, const char *fm
mchristi e81a583
 	}
mchristi e81a583
 }
mchristi e81a583
 
mchristi e81a583
+void log_info(const char *fmt, ...)
mchristi e81a583
+{
mchristi e81a583
+	va_list ap;
mchristi e81a583
+	va_start(ap, fmt);
mchristi e81a583
+	log_func(LOG_INFO, log_func_priv, fmt, ap);
mchristi e81a583
+	va_end(ap);
mchristi e81a583
+}
mchristi e81a583
+
mchristi e81a583
 static void __dump_line(int level, unsigned char *buf, int *cp)
mchristi e81a583
 {
mchristi e81a583
 	char line[16*3+5], *lp = line;
mchristi e81a583
diff -aurp open-iscsi-2.0-872-rc1-bnx2i/usr/log.h open-iscsi-2.0-872-rc1-bnx2i.work/usr/log.h
mchristi e81a583
--- open-iscsi-2.0-872-rc1-bnx2i/usr/log.h	2010-05-06 15:26:01.000000000 -0500
mchristi e81a583
+++ open-iscsi-2.0-872-rc1-bnx2i.work/usr/log.h	2010-05-06 15:39:58.000000000 -0500
mchristi e81a583
@@ -71,6 +71,8 @@ extern int log_init(char *program_name, 
mchristi e81a583
 	void *priv);
mchristi e81a583
 extern void log_close (pid_t pid);
mchristi e81a583
 extern void dump_logmsg (void *);
mchristi e81a583
+extern void log_info(const char *fmt, ...)
mchristi e81a583
+	__attribute__ ((format (printf, 1, 2)));
mchristi e81a583
 extern void log_warning(const char *fmt, ...)
mchristi e81a583
 	__attribute__ ((format (printf, 1, 2)));
mchristi e81a583
 extern void log_error(const char *fmt, ...)
mchristi e81a583
diff -aurp open-iscsi-2.0-872-rc1-bnx2i/usr/session_mgmt.c open-iscsi-2.0-872-rc1-bnx2i.work/usr/session_mgmt.c
mchristi e81a583
--- open-iscsi-2.0-872-rc1-bnx2i/usr/session_mgmt.c	2010-05-06 15:26:01.000000000 -0500
mchristi e81a583
+++ open-iscsi-2.0-872-rc1-bnx2i.work/usr/session_mgmt.c	2010-05-06 15:43:28.000000000 -0500
mchristi e81a583
@@ -42,10 +42,10 @@ static void log_login_msg(struct node_re
mchristi e81a583
 			  rec->conn[0].port);
mchristi e81a583
 		iscsid_handle_error(rc);
mchristi e81a583
 	} else
mchristi e81a583
-		log_warning("Login to [iface: %s, target: %s, portal: "
mchristi e81a583
-			    "%s,%d] successful.", rec->iface.name,
mchristi e81a583
-			    rec->name, rec->conn[0].address,
mchristi e81a583
-			    rec->conn[0].port);
mchristi e81a583
+		log_info("Login to [iface: %s, target: %s, portal: "
mchristi e81a583
+			 "%s,%d] successful.", rec->iface.name,
mchristi e81a583
+			 rec->name, rec->conn[0].address,
mchristi e81a583
+			 rec->conn[0].port);
mchristi e81a583
 }
mchristi e81a583
 
mchristi e81a583
 struct iscsid_async_req {
mchristi e81a583
@@ -100,15 +100,15 @@ int iscsi_login_portal(void *data, struc
mchristi e81a583
 	struct iscsid_async_req *async_req = NULL;
mchristi e81a583
 	int rc = 0, fd;
mchristi e81a583
 
mchristi e81a583
-	log_warning("Logging in to [iface: %s, target: %s, portal: %s,%d]",
mchristi e81a583
-		    rec->iface.name, rec->name, rec->conn[0].address,
mchristi e81a583
-		    rec->conn[0].port);
mchristi e81a583
+	log_info("Logging in to [iface: %s, target: %s, portal: %s,%d]",
mchristi e81a583
+		 rec->iface.name, rec->name, rec->conn[0].address,
mchristi e81a583
+		 rec->conn[0].port);
mchristi e81a583
 
mchristi e81a583
 	if (list) {
mchristi e81a583
 		async_req = calloc(1, sizeof(*async_req));
mchristi e81a583
 		if (!async_req)
mchristi e81a583
-			log_error("Could not allocate memory for async login "
mchristi e81a583
-				  "handling. Using sequential login instead.");
mchristi e81a583
+			log_info("Could not allocate memory for async login "
mchristi e81a583
+				 "handling. Using sequential login instead.");
mchristi e81a583
 		else
mchristi e81a583
 			INIT_LIST_HEAD(&async_req->list);
mchristi e81a583
 	}
mchristi e81a583
@@ -215,10 +215,10 @@ static void log_logout_msg(struct sessio
mchristi e81a583
 			  info->persistent_address, info->port);
mchristi e81a583
 		iscsid_handle_error(rc);
mchristi e81a583
 	} else
mchristi e81a583
-		log_warning("Logout of [sid: %d, target: %s, "
mchristi e81a583
-			    "portal: %s,%d] successful.",
mchristi e81a583
-			    info->sid, info->targetname,
mchristi e81a583
-			    info->persistent_address, info->port);
mchristi e81a583
+		log_info("Logout of [sid: %d, target: %s, "
mchristi e81a583
+			 "portal: %s,%d] successful.",
mchristi e81a583
+			 info->sid, info->targetname,
mchristi e81a583
+			 info->persistent_address, info->port);
mchristi e81a583
 }
mchristi e81a583
 
mchristi e81a583
 static int iscsid_logout_reqs_wait(struct list_head *list)
mchristi e81a583
@@ -252,16 +252,16 @@ int iscsi_logout_portal(struct session_i
mchristi e81a583
 	int fd, rc;
mchristi e81a583
 
mchristi e81a583
 	/* TODO: add fn to add session prefix info like dev_printk */
mchristi e81a583
-	log_warning("Logging out of session [sid: %d, target: %s, portal: "
mchristi e81a583
-		    "%s,%d]",
mchristi e81a583
-		    info->sid, info->targetname, info->persistent_address,
mchristi e81a583
-		    info->port);
mchristi e81a583
+	log_info("Logging out of session [sid: %d, target: %s, portal: "
mchristi e81a583
+		 "%s,%d]",
mchristi e81a583
+		 info->sid, info->targetname, info->persistent_address,
mchristi e81a583
+		 info->port);
mchristi e81a583
 
mchristi e81a583
 	if (list) {
mchristi e81a583
 		async_req = calloc(1, sizeof(*async_req));
mchristi e81a583
 		if (!async_req)
mchristi e81a583
-			log_error("Could not allocate memory for async logout "
mchristi e81a583
-				  "handling. Using sequential logout instead.");
mchristi e81a583
+			log_info("Could not allocate memory for async logout "
mchristi e81a583
+				 "handling. Using sequential logout instead.");
mchristi e81a583
 	}
mchristi e81a583
 
mchristi e81a583
 	if (!async_req)