admin/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream-git/master'

Browse Source 
Conflicts:
	include/iscsi-private.h
	include/iscsi.h
	lib/connect.c
	lib/init.c
	lib/scsi-lowlevel.c
This commit is contained in:
Peter Lieven
2012-11-12 16:02:57 +01:00
parent 5e1d011270 736e175e83
commit 8cb369b87f
21 changed files with 205 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/iscsi-private.h
View File

@@ -130,7 +130,10 @@ struct iscsi_context {
int lun;
int no_auto_reconnect;
int reconnect_deferred;
int debug;
int log_level;
iscsi_log_fn log_fn;
int mallocs;
int reallocs;
int frees;
@@ -309,6 +312,16 @@ void iscsi_set_noautoreconnect(struct iscsi_context *iscsi, int state);
void iscsi_decrement_iface_rr(void);
#define ISCSI_LOG(iscsi, level, format, args...) \
do { \
if (level <= iscsi->log_level && iscsi->log_fn) { \
iscsi_log_message(iscsi, level, format, ## args); \
} \
} while (0)
void
iscsi_log_message(struct iscsi_context *iscsi, int level, const char *format, ...);
#ifdef __cplusplus
}
#endif