summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author <hch@lst.de>2005-04-03 14:52:44 -0500
committerJames Bottomley <jejb@titanic>2005-04-18 12:31:52 -0500
commitb6651129cc27d56a9cbefcb5f713cea7706fd6b7 (patch)
tree2b3f664a499ff568cefb5718bfa0b4998a4c43be
parenta757e64cfa400391041ed7953f0290c34a820c93 (diff)
downloadop-kernel-dev-b6651129cc27d56a9cbefcb5f713cea7706fd6b7.zip
op-kernel-dev-b6651129cc27d56a9cbefcb5f713cea7706fd6b7.tar.gz
[PATCH] consolidate timeout defintions in scsi.h
Adapted from a patch in SuSE's kernel SRPM. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
-rw-r--r--drivers/block/scsi_ioctl.c5
-rw-r--r--drivers/scsi/scsi_ioctl.c5
-rw-r--r--include/scsi/scsi.h9
3 files changed, 9 insertions, 10 deletions
diff --git a/drivers/block/scsi_ioctl.c b/drivers/block/scsi_ioctl.c
index 689527a..681871c 100644
--- a/drivers/block/scsi_ioctl.c
+++ b/drivers/block/scsi_ioctl.c
@@ -328,11 +328,6 @@ static int sg_io(struct file *file, request_queue_t *q,
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,
diff --git a/drivers/scsi/scsi_ioctl.c b/drivers/scsi/scsi_ioctl.c
index 68c9728..7a6b530 100644
--- a/drivers/scsi/scsi_ioctl.c
+++ b/drivers/scsi/scsi_ioctl.c
@@ -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
diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
index 1d54c06..3507b3d 100644
--- a/include/scsi/scsi.h
+++ b/include/scsi/scsi.h
@@ -360,6 +360,15 @@ struct scsi_lun {
#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 |\
OpenPOWER on IntegriCloud