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

Merge pull request #160 from plieven/for_upstream

Browse Source 
For upstream
This commit is contained in:
Ronnie Sahlberg
2015-04-23 06:27:37 -07:00
parent cf4076dba9 cd0f4a30d6
commit 85c531e44e
2 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/connect.c
View File

@@ -263,7 +263,7 @@ void iscsi_reconnect_cb(struct iscsi_context *iscsi _U_, int status,
backoff = 30;
}
if (iscsi->reconnect_max_retries != -1 &&
iscsi->old_iscsi->retry_cnt >= iscsi->reconnect_max_retries) {
iscsi->old_iscsi->retry_cnt > iscsi->reconnect_max_retries) {
/* we will exit iscsi_service with -1 the next time we enter it. */
backoff = 0;
}
@@ -375,7 +375,7 @@ int iscsi_reconnect(struct iscsi_context *old_iscsi)
}
if (old_iscsi->reconnect_max_retries != -1 && old_iscsi->old_iscsi &&
old_iscsi->old_iscsi->retry_cnt >= old_iscsi->reconnect_max_retries) {
old_iscsi->old_iscsi->retry_cnt > old_iscsi->reconnect_max_retries) {
iscsi_defer_reconnect(old_iscsi);
return -1;
}

9
lib/init.c
View File

@@ -60,19 +60,10 @@ void* iscsi_zmalloc(struct iscsi_context *iscsi, size_t size) {
}
void* iscsi_realloc(struct iscsi_context *iscsi, void* ptr, size_t size) {
int i;
void * _ptr = realloc(ptr, size);
if (_ptr != NULL) {
iscsi->reallocs++;
}
if (ptr != NULL) {
for (i = 0; i < iscsi->smalloc_free; i++) {
if (iscsi->smalloc_ptrs[i] == ptr) {
iscsi->smalloc_ptrs[i] = _ptr;
break;
}
}
}
return _ptr;
}