tree 2b3f664a499ff568cefb5718bfa0b4998a4c43be
parent a757e64cfa400391041ed7953f0290c34a820c93
author <[EMAIL PROTECTED]> Mon, 04 Apr 2005 00:52:44 -0500
committer James Bottomley <[EMAIL PROTECTED]> Mon, 18 Apr 2005 22:31:52 -0500
[PATCH] consolidate timeout defintions in scsi.h
Adapted from a patch in SuSE's kernel SRPM.
Signed-off-by: James Bottomley <[EMAIL PROTECTED]>
dontdiff | 0
i386/kernel/vsyscall-note.S | 0
block/scsi_ioctl.c | 5 -----
scsi/scsi_ioctl.c | 5 -----
asm-mips/vr41xx/pci.h | 0
scsi/scsi.h | 9 +++++++++
6 files changed, 9 insertions(+), 10 deletions(-)
Index: Documentation/dontdiff
===================================================================
Index: arch/i386/kernel/vsyscall-note.S
===================================================================
Index: drivers/block/scsi_ioctl.c
===================================================================
--- 73214a96945eb017e33c0f732ad0f1e8d10c2e8e/drivers/block/scsi_ioctl.c
(mode:100644 sha1:689527a89de7b3f88da38a1f39d855131b7c41fe)
+++ 2b3f664a499ff568cefb5718bfa0b4998a4c43be/drivers/block/scsi_ioctl.c
(mode:100644 sha1:681871ca5d60a89af6978c4727daac1853314d5c)
@@ -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,
Index: drivers/scsi/scsi_ioctl.c
===================================================================
--- 73214a96945eb017e33c0f732ad0f1e8d10c2e8e/drivers/scsi/scsi_ioctl.c
(mode:100644 sha1:68c9728dfbbb3f9cd66919abde4d0893971a360a)
+++ 2b3f664a499ff568cefb5718bfa0b4998a4c43be/drivers/scsi/scsi_ioctl.c
(mode:100644 sha1:7a6b530115ac9dbe78e136dc7e7ba5568e015cf0)
@@ -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
Index: include/asm-mips/vr41xx/pci.h
===================================================================
Index: include/scsi/scsi.h
===================================================================
--- 73214a96945eb017e33c0f732ad0f1e8d10c2e8e/include/scsi/scsi.h (mode:100644
sha1:1d54c063ae52fa958c5cb3ad1cf5198e1de2ae52)
+++ 2b3f664a499ff568cefb5718bfa0b4998a4c43be/include/scsi/scsi.h (mode:100644
sha1:3507b3d7c0ebeed2fddc6bb8ac08e782d4063329)
@@ -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 |\
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
