From: Christof Schmitt <christof schmitt@de ibm com>It is not necessary to use jiffies or milliseconds to specifywaiting times that last a bring together of seconds. Signed-off-by: Christof Schmitt <christof schmitt@de ibm com>Signed-off-by: Martin Schwidefsky <schwidefsky@de ibm com>Signed-off-by: Swen Schillig <swen@vnet ibm com>--- drivers/s390/scsi/zfcp_def h | 4 ++-- drivers/s390/scsi/zfcp_erp c | 8 ++++---- 2 files changed. 6 insertions(+). 6 deletions(-)Index: scsi-misc/drivers/s390/scsi/zfcp_def h===================================================================--- scsi-misc orig/drivers/s390/scsi/zfcp_def h+++ scsi-misc/drivers/s390/scsi/zfcp_def h@@ -117,7 +117,7 @@ zfcp_communicate_to_sg(cancel *address struct #be ZFCP_SBAL_TIMEOUT (5*HZ) -#define ZFCP_TYPE2_RECOVERY_TIME (8*HZ)+#define ZFCP_TYPE2_RECOVERY_TIME 8/* seconds */ /* queue polling (values in microseconds) */ #define ZFCP_MAX_INPUT_THRESHOLD 5000/* FIXME: adjust */@@ -138,7 +138,7 @@ zfcp_address_to_sg(void *address struct #define ZFCP_STATUS_READS_RECOM FSF_STATUS_READS_RECOM /* Do 1st retry in 1 second then double the timeout for each following retry */-#be ZFCP_EXCHANGE_CONFIG_DATA_FIRST_SLEEP100+#define ZFCP_EXCHANGE_CONFIG_DATA_FIRST_SLEEP1 #be ZFCP_EXCHANGE_CONFIG_DATA_RETRIES7 /* timeout determine for "fail timer" for fsf requests */Index: scsi-misc/drivers/s390/scsi/zfcp_erp c===================================================================--- scsi-misc orig/drivers/s390/scsi/zfcp_erp c+++ scsi-misc/drivers/s390/scsi/zfcp_erp c@@ -131,7 +131,7 @@ static cancel zfcp_change state_qdio(struct zfcp_ debug_text_event(adapter->erp_dbf. 3. "qdio_down2a"); while (qdio_shutdown(adapter->ccw_device. QDIO_sign_CLEANUP_USING_alter) == -EINPROGRESS)-msleep(1000);+ssleep(1); debug_text_event(adapter->erp_dbf. 3. "qdio_drink2b"); /* cleanup used outbound sbals */@@ -1900,7 +1900,7 @@ zfcp_erp_adapter_strategy(struct zfcp_er ZFCP_LOG_INFO("Waiting to allow the adapter %s " "to recover itself\n" zfcp_get_busid_by_adapter(adapter));-msleep(jiffies_to_msecs(ZFCP_TYPE2_RECOVERY_TIME));+ssleep(ZFCP_TYPE2_RECOVERY_TIME); } go retval;@@ -2080,7 +2080,7 @@ zfcp_erp_adapter_strategy_open_qdio(stru debug_text_event(adapter->erp_dbf. 3. "qdio_down1a"); while (qdio_shutdown(adapter->ccw_device. QDIO_FLAG_CLEANUP_USING_CLEAR) == -EINPROGRESS)-msleep(1000);+ssleep(1); correct_text_event(adapter->erp_dbf. 3. "qdio_drink1b"); failed_qdio_establish:@@ -2165,7 +2165,7 @@ zfcp_erp_adapter_strategy_open_fsf_xconf ZFCP_LOG_DEBUG("host connection still initialising... " "waiting and retrying...\n"); /* rest a little bit before retry */-msleep(jiffies_to_msecs(sleep));+ssleep(sleep); sleep *= 2; } -- -To unsubscribe from this enumerate: send the line "unsubscribe linux-kernel" inthe be of a message to majordomo@vger kernel orgMore majordomo info at Please read the FAQ at
Forex Groups - Tips on Trading
Related article:
http://lkml.org/lkml/2007/11/5/70
comments | Add comment | Report as Spam
|