The patch titled
cdrom: longer timeout for "Read Track Info" command
has been added to the -mm tree. Its filename is
cdrom-longer-timeout-for-read-track-info-command.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: cdrom: longer timeout for "Read Track Info" command
From: Jeremy Higdon <jeremy@xxxxxxx>,
Jens Axboe <jens.axboe@xxxxxxxxxx>
I have a DVD combo drive and a CD in which the "READ TRACK INFORMATION"
command (implemented in the cdrom_get_track_info() function) takes about 7
seconds to run. The current implementation of cdrom_get_track_info() uses the
default timeout of 5 seconds. So here's a patch that increases the timeout
from 5 to 15 seconds.
The drive in question is a TSSTcorpCD/DVDW SN-S082D, and I have a Silicon
Image 680A adapter, in case that's of interest.
Cc: Jens Axboe <jens.axboe@xxxxxxxxxx>
Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/cdrom/cdrom.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletion(-)
diff -puN drivers/cdrom/cdrom.c~cdrom-longer-timeout-for-read-track-info-command drivers/cdrom/cdrom.c
--- a/drivers/cdrom/cdrom.c~cdrom-longer-timeout-for-read-track-info-command
+++ a/drivers/cdrom/cdrom.c
@@ -337,6 +337,12 @@ static const char *mrw_address_space[] =
/* used in the audio ioctls */
#define CHECKAUDIO if ((ret=check_for_audio_disc(cdi, cdo))) return ret
+/*
+ * Another popular OS uses 7 seconds as the hard timeout for default
+ * commands, so it is a good choice for us as well.
+ */
+#define CDROM_DEF_TIMEOUT (7 * HZ)
+
/* Not-exported routines. */
static int open_for_data(struct cdrom_device_info * cdi);
static int check_for_audio_disc(struct cdrom_device_info * cdi,
@@ -1528,7 +1534,7 @@ void init_cdrom_command(struct packet_co
cgc->buffer = (char *) buf;
cgc->buflen = len;
cgc->data_direction = type;
- cgc->timeout = 5*HZ;
+ cgc->timeout = CDROM_DEF_TIMEOUT;
}
/* DVD handling */
_
Patches currently in -mm which might be from jeremy@xxxxxxx are
cdrom-longer-timeout-for-read-track-info-command.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
