Re: [PATCH] Format Unit can take many hours

Kurt Garloff
2004-05-11T12:45:27Z

[-- Attachment #1.1: Type: text/plain, Size: 306 bytes --]

Hi Jens,

On Tue, May 11, 2004 at 02:20:38PM +0200, Jens Axboe wrote:
> block/scsi_ioctl.c should likely receive similar treatment then.

Good point.
--
Kurt Garloff <garloff@suse.de> Cologne, DE
SUSE LINUX AG, Nuernberg, DE SUSE Labs (Head)

[-- Attachment #1.2: scsi-format-unit-timeout.diff --]
[-- Type: text/plain, Size: 1506 bytes --]

--- linux-2.6.5.orig/drivers/scsi/scsi_ioctl.c 2004-04-04 05:38:20.000000000 +0200
+++ linux-2.6.5/drivers/scsi/scsi_ioctl.c 2004-05-11 08:59:12.837421215 +0200
@@ -26,12 +26,12 @@
#include "scsi_logging.h"

#define NORMAL_RETRIES 5
-#define IOCTL_NORMAL_TIMEOUT (10 * HZ)
-#define FORMAT_UNIT_TIMEOUT (2 * 60 * 60 * HZ)
+#define IOCTL_NORMAL_TIMEOUT (10 * HZ)
+#define FORMAT_UNIT_TIMEOUT (12 * 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 READ_DEFECT_DATA_TIMEOUT (60 * HZ) /* ZIP-250 on parallel port takes as long! */

#define MAX_BUF PAGE_SIZE

--- linux-2.6.5/drivers/block/scsi_ioctl.c.orig 2004-05-11 00:05:57.000000000 +0200
+++ linux-2.6.5/drivers/block/scsi_ioctl.c 2004-05-11 14:42:30.277083312 +0200
@@ -209,11 +209,11 @@ static int sg_io(request_queue_t *q, str
return 0;
}

-#define FORMAT_UNIT_TIMEOUT (2 * 60 * 60 * HZ)
+#define FORMAT_UNIT_TIMEOUT (12 * 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 READ_DEFECT_DATA_TIMEOUT (60 * HZ)
#define OMAX_SB_LEN 16 /* For backward compatibility */

static int sg_scsi_ioctl(request_queue_t *q, struct gendisk *bd_disk,

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]