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

Always declare variables at the start of a new scope.

Browse Source
This commit is contained in:
Ronnie Sahlberg
2013-10-05 13:43:10 -07:00
parent 8c87941b00
commit 720e426c92
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/connect.c
View File

@@ -231,6 +231,7 @@ void iscsi_defer_reconnect(struct iscsi_context *iscsi)
int iscsi_reconnect(struct iscsi_context *old_iscsi) int iscsi_reconnect(struct iscsi_context *old_iscsi)
{ {
struct iscsi_context *iscsi = old_iscsi; struct iscsi_context *iscsi = old_iscsi;
int retry = 0;
/* if there is already a deferred reconnect do not try again */ /* if there is already a deferred reconnect do not try again */
if (iscsi->reconnect_deferred) { if (iscsi->reconnect_deferred) {
@@ -249,8 +250,6 @@ int iscsi_reconnect(struct iscsi_context *old_iscsi)
return 0; return 0;
} }
int retry = 0;
if (old_iscsi->last_reconnect) { if (old_iscsi->last_reconnect) {
if (time(NULL) - old_iscsi->last_reconnect < 5) sleep(5); if (time(NULL) - old_iscsi->last_reconnect < 5) sleep(5);
} }
@@ -288,20 +287,21 @@ try_again:
iscsi->reconnect_max_retries = old_iscsi->reconnect_max_retries; iscsi->reconnect_max_retries = old_iscsi->reconnect_max_retries;
if (iscsi_full_connect_sync(iscsi, iscsi->portal, iscsi->lun) != 0) { if (iscsi_full_connect_sync(iscsi, iscsi->portal, iscsi->lun) != 0) {
int backoff = retry;
if (iscsi->reconnect_max_retries != -1 && retry >= iscsi->reconnect_max_retries) { if (iscsi->reconnect_max_retries != -1 && retry >= iscsi->reconnect_max_retries) {
iscsi_defer_reconnect(old_iscsi); iscsi_defer_reconnect(old_iscsi);
iscsi_destroy_context(iscsi); iscsi_destroy_context(iscsi);
return -1; return -1;
} }
int backoff=retry;
if (backoff > 10) { if (backoff > 10) {
backoff+=rand()%10; backoff += rand() % 10;
backoff-=5; backoff -= 5;
} }
if (backoff > 30) { if (backoff > 30) {
backoff=30; backoff = 30;
} }
ISCSI_LOG(iscsi, 1, "reconnect try %d failed, waiting %d seconds",retry,backoff); ISCSI_LOG(iscsi, 1, "reconnect try %d failed, waiting %d seconds", retry, backoff);
iscsi_destroy_context(iscsi); iscsi_destroy_context(iscsi);
sleep(backoff); sleep(backoff);
retry++; retry++;