From 52d868ccb57be7d5a2dae9535c9e39caf2e6077e Mon Sep 17 00:00:00 2001 From: Christophe Varoqui Date: Fri, 16 Jun 2006 12:36:55 +0200 Subject: [PATCH] Finish up the work on SG_IO timeout all over the place. --- libcheckers/hp_sw.c | 1 - libcheckers/readsector0.c | 1 - libmultipath/discovery.h | 5 ++++- path_priority/pp_alua/rtpg.c | 2 +- path_priority/pp_balance_units/pp_balance_units.c | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/libcheckers/hp_sw.c b/libcheckers/hp_sw.c index 08da618..b9731ff 100644 --- a/libcheckers/hp_sw.c +++ b/libcheckers/hp_sw.c @@ -19,7 +19,6 @@ #define INQUIRY_CMDLEN 6 #define INQUIRY_CMD 0x12 #define SENSE_BUFF_LEN 32 -#define DEF_TIMEOUT 60000 #define SCSI_CHECK_CONDITION 0x2 #define SCSI_COMMAND_TERMINATED 0x22 #define SG_ERR_DRIVER_SENSE 0x08 diff --git a/libcheckers/readsector0.c b/libcheckers/readsector0.c index e368fb4..b0acec9 100644 --- a/libcheckers/readsector0.c +++ b/libcheckers/readsector0.c @@ -16,7 +16,6 @@ #include "../libmultipath/sg_include.h" #define SENSE_BUFF_LEN 32 -#define DEF_TIMEOUT 60000 #define MSG_READSECTOR0_UP "readsector0 checker reports path is up" #define MSG_READSECTOR0_DOWN "readsector0 checker reports path is down" diff --git a/libmultipath/discovery.h b/libmultipath/discovery.h index 65ecd41..ab62a59 100644 --- a/libmultipath/discovery.h +++ b/libmultipath/discovery.h @@ -5,7 +5,6 @@ #define INQUIRY_CMDLEN 6 #define INQUIRY_CMD 0x12 #define SENSE_BUFF_LEN 32 -#define DEF_TIMEOUT 60000 #define RECOVERED_ERROR 0x01 #define MX_ALLOC_LEN 255 #define TUR_CMD_LEN 6 @@ -14,6 +13,10 @@ #define BLKGETSIZE _IO(0x12,96) #endif +#ifndef DEF_TIMEOUT +#define DEF_TIMEOUT 300000 +#endif + /* * exerpt from sg_err.h */ diff --git a/path_priority/pp_alua/rtpg.c b/path_priority/pp_alua/rtpg.c index 9aea560..6922d9a 100644 --- a/path_priority/pp_alua/rtpg.c +++ b/path_priority/pp_alua/rtpg.c @@ -28,7 +28,7 @@ #include "rtpg.h" #define SENSE_BUFF_LEN 32 -#define DEF_TIMEOUT 60000 +#define DEF_TIMEOUT 300000 /* * Macro used to print debug messaged. diff --git a/path_priority/pp_balance_units/pp_balance_units.c b/path_priority/pp_balance_units/pp_balance_units.c index 60b97d3..4ab6d75 100644 --- a/path_priority/pp_balance_units/pp_balance_units.c +++ b/path_priority/pp_balance_units/pp_balance_units.c @@ -38,7 +38,7 @@ #define INQUIRY_CMDLEN 6 #define INQUIRY_CMD 0x12 #define SENSE_BUFF_LEN 32 -#define DEF_TIMEOUT 60000 +#define DEF_TIMEOUT 300000 #define RECOVERED_ERROR 0x01 #define MX_ALLOC_LEN 255 #define SCSI_CHECK_CONDITION 0x2 -- 2.7.4