consolidate timeout defintions in scsi.h
Subsystems (2)
PATCH 1/1 consolidate timeout defintions in scsi.h
Adapted from a patch in SuSE's kernel SRPM.
drivers/block/scsi_ioctl.c +0 -5
@@ -328,11 +328,6 @@return 0 ; } -#define FORMAT_UNIT_TIMEOUT (2 * 60 * 60 * HZ) -#define START_STOP_TIMEOUT (60 * HZ) -#define MOVE_MEDIUM_TIMEOUT (5 * 60 * HZ) -#define READ_ELEMENT_STATUS_TIMEOUT (5 * 60 * HZ) -#define READ_DEFECT_DATA_TIMEOUT (60 * HZ )#define OMAX_SB_LEN 16/* For backward compatibility */ static int sg_scsi_ioctl(struct file *file, request_queue_t *q,
drivers/scsi/scsi_ioctl.c +0 -5
@@ -27,11 +27,6 @@#define NORMAL_RETRIES 5#define IOCTL_NORMAL_TIMEOUT (10 * HZ) -#define FORMAT_UNIT_TIMEOUT (2 * 60 * 60 * HZ) -#define START_STOP_TIMEOUT (60 * HZ) -#define MOVE_MEDIUM_TIMEOUT (5 * 60 * HZ) -#define READ_ELEMENT_STATUS_TIMEOUT (5 * 60 * HZ) -#define READ_DEFECT_DATA_TIMEOUT (60 * HZ )/* ZIP-250 on parallel port takes as long! */ #define MAX_BUF PAGE_SIZE
include/scsi/scsi.h +9 -0
@@ -360,6 +360,15 @@#define sense_error (sense) ((sense) & 0xf)#define sense_valid (sense) ((sense) & 0x80); +/* +* default timeouts +*/ +#define FORMAT_UNIT_TIMEOUT (2 * 60 * 60 * HZ) +#define START_STOP_TIMEOUT (60 * HZ) +#define MOVE_MEDIUM_TIMEOUT (5 * 60 * HZ) +#define READ_ELEMENT_STATUS_TIMEOUT (5 * 60 * HZ) +#define READ_DEFECT_DATA_TIMEOUT (60 * HZ ) +#define IDENTIFY_BASE 0x80#define IDENTIFY (can_disconnect, lun) (IDENTIFY_BASE |\