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

connect: fir off by one error in iscsi->reconnect_max_retries

Browse Source 
Before b152d26 it was possible to set iscsi->reconnect_max_retries to 0.
This allowed reconnects, but aborted as soon as the reconnect failed.
The same behaviour is currenltly only possible by setting iscsi->reconnect_max_retries
to 1. iscsi->reconnect_max_retries == 0 forbids reconnecting completly.

Signed-off-by: Peter Lieven <pl@kamp.de>
This commit is contained in:
Peter Lieven
2015-04-23 14:16:17 +02:00
parent 52a6bdb774
commit cd0f4a30d6
1 changed files with 2 additions and 2 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;
}