[Midnightbsd-cvs] src: dev/ata: Increase timeout from 5 to 10 seconds.

[laffer1 at midnightbsd.org]

Log Message:
-----------
Increase timeout from 5 to 10 seconds.  This is an arbritrary value and found to be too short on SATA disks for certain operations.  (moving bad blocks for instance)  

This might also help with write errors in virtual machines.

Modified Files:
--------------
    src/sys/dev/ata:
        ata-disk.c (r1.4 -> r1.5)
        ata-queue.c (r1.5 -> r1.6)
        ata-raid.c (r1.4 -> r1.5)

-------------- next part --------------
Index: ata-raid.c
===================================================================
RCS file: /home/cvs/src/sys/dev/ata/ata-raid.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -L sys/dev/ata/ata-raid.c -L sys/dev/ata/ata-raid.c -u -r1.4 -r1.5
--- sys/dev/ata/ata-raid.c
+++ sys/dev/ata/ata-raid.c
@@ -3945,7 +3945,7 @@
 	printf("FAILURE - out of memory in ata_raid_init_request\n");
 	return NULL;
     }
-    request->timeout = 5;
+    request->timeout = 10;
     request->retries = 2;
     request->callback = ata_raid_done;
     request->driver = rdp;
Index: ata-queue.c
===================================================================
RCS file: /home/cvs/src/sys/dev/ata/ata-queue.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -L sys/dev/ata/ata-queue.c -L sys/dev/ata/ata-queue.c -u -r1.5 -r1.6
--- sys/dev/ata/ata-queue.c
+++ sys/dev/ata/ata-queue.c
@@ -385,7 +385,7 @@
 	    request->bytecount = sizeof(struct atapi_sense);
 	    request->donecount = 0;
 	    request->transfersize = sizeof(struct atapi_sense);
-	    request->timeout = 5;
+	    request->timeout = 10;
 	    request->flags &= (ATA_R_ATAPI | ATA_R_QUIET);
 	    request->flags |= (ATA_R_READ | ATA_R_AT_HEAD | ATA_R_REQUEUE);
 	    ATA_DEBUG_RQ(request, "autoissue request sense");
Index: ata-disk.c
===================================================================
RCS file: /home/cvs/src/sys/dev/ata/ata-disk.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -L sys/dev/ata/ata-disk.c -L sys/dev/ata/ata-disk.c -u -r1.4 -r1.5
--- sys/dev/ata/ata-disk.c
+++ sys/dev/ata/ata-disk.c
@@ -229,7 +229,7 @@
     request->dev = dev;
     request->bio = bp;
     request->callback = ad_done;
-    request->timeout = 5;
+    request->timeout = 10;
     request->retries = 2;
     request->data = bp->bio_data;
     request->bytecount = bp->bio_bcount;