linux.git/drivers/cdrom/cdrom.c, branch v2.6.27

cdrom: handle TOC

2008-08-18T19:40:04+00:00

This patch should fix TOC handling for cdroms that can not play audio.  It
extends commit af744e3294d09d706c4eae26cffaaa68a8d40337 ("cdrom: don't
check CDC_PLAY_AUDIO in cdrom_count_tracks()") with a safety check and
non-audio ioctls support.

Since CDC_PLAY_AUDIO flag was used not only to check ability to play audio
but also to ensure that audio_ioctl was not NULL, all TOC-related
operations had to use it.

As far as I understand, now audio_ioctl is never NULL, so a sanity check
during device registration should be sufficient.

It was tested on Optiarc AD7203A device, that has no ability to play
audio.

Cc: Tejun Heo 
Cc: Jens Axboe 
Cc: Borislav Petkov 
Signed-off-by: Andrew Morton 
[bart: remove now unneeded ->audio_ioctl check (noticed by Borislav)]
Signed-off-by: Bartlomiej Zolnierkiewicz

cdrom: don't check CDC_PLAY_AUDIO in cdrom_count_tracks()

2008-08-05T16:17:02+00:00

According to MMC-3 (or any later versions) READ TOCs are mandatory
commands and have nothing to do with CDC_PLAY_AUDIO.  I have no idea why
the check was put there in the first place but it now only breaks
automatic actions on certain drives.

Note that this test was only effective when ide-cdrom was being used
as sr didn't mask CDC_PLAY_AUDIO according to the capabilities.

Signed-off-by: Tejun Heo 
Acked-by: Jens Axboe 
Cc: Borislav Petkov 
Signed-off-by: Andrew Morton 
Signed-off-by: Bartlomiej Zolnierkiewicz

cdrom: revert commit 22a9189 (cdrom: use kmalloced buffers instead of buffers on stack)

2008-07-04T07:52:14+00:00

The commit 22a9189fd073db3d03a4cf8b8c098aa207602de1 (cdrom: use
kmalloced buffers instead of buffers on stack) is introduced to use
kmalloced buffers for packet commands to avoid stack corruption on non
coherent platforms.

SCSI cdrom uses blk_rq_map_kern, which properly avoids DMA on the
stack by using the bounce buffers. IDE cdrom also has the mechnism to
avoids DMA on the stack. So we don't need this extra complexitiy in
cdrom.c, such as allocating just 8 bytes. The lower layers can handle
it.

Signed-off-by: FUJITA Tomonori 
Cc: Thomas Bogendoerfer 
Cc: Bartlomiej Zolnierkiewicz 
Cc: Thomas Bogendoerfer 
Cc: Tejun Heo 
Cc: James Bottomley 
Signed-off-by: Andrew Morton 
Signed-off-by: Jens Axboe

block: no need to initialize rq->cmd with blk_get_request

2008-04-29T12:48:55+00:00

blk_get_request initializes rq->cmd (rq_init does) so the users don't
need to do that.

The purpose of this patch is to remove sizeof(rq->cmd) and &rq->cmd,
as a preparation for large command support, which changes rq->cmd from
the static array to a pointer. sizeof(rq->cmd) will not make sense and
&rq->cmd won't work.

Signed-off-by: FUJITA Tomonori 
Cc: James Bottomley 
Cc: Alasdair G Kergon 
Cc: Jens Axboe 
Signed-off-by: Jens Axboe

cdrom: use kmalloced buffers instead of buffers on stack

2008-04-21T07:50:08+00:00

If cdrom commands are issued to a scsi drive in most cases the buffer will be
filled via dma.  This leads to bad stack corruption on non coherent platforms,
because the buffers are neither cache line aligned nor is the size a multiple
of the cache line size.  Using kmalloced buffers avoids this.

Signed-off-by: Thomas Bogendoerfer 
Signed-off-by: Jens Axboe

cdrom: make unregister_cdrom() return void

2008-04-21T07:50:08+00:00

Now unregister_cdrom() always returns 0.
Make it return void and update all callers that check the return value.

Signed-off-by: Akinobu Mita 
Cc: Adrian McMenamin 
Cc: Borislav Petkov 
Signed-off-by: Jens Axboe

cdrom: use list_head for cdrom_device_info list

2008-04-21T07:50:08+00:00

Use list_head for cdrom_device_info list instead of opencoded
singly list handling.

Signed-off-by: Akinobu Mita 
Signed-off-by: Jens Axboe

cdrom: protect cdrom_device_info list by mutex

2008-04-21T07:50:08+00:00

This patch protects the list of cdrom_device_info by cdrom_mutex
when the file in /proc/sys/dev/cdrom/ is written.

Signed-off-by: Akinobu Mita 
Signed-off-by: Jens Axboe

cdrom: cleanup hardcoded error-code

2008-04-21T07:50:07+00:00

This patch eliminates hardcoded return value of register_cdrom().

It also changes the return value to -EINVAL.
It is more appropriate than -2 (-ENOENT) because it is only
happen invalid usage of register_cdrom() by broken cdrom driver.

Signed-off-by: Akinobu Mita 
Signed-off-by: Jens Axboe

cdrom: remove ifdef CONFIG_SYSCTL

2008-04-21T07:50:07+00:00

This patch removes #ifdef for CONFIG_SYSCTL by defining empty
cdrom_sysctl_register and cdrom_sysctl_unregister when CONFIG_SYSCTL
is not defined.

Signed-off-by: Akinobu Mita 
Signed-off-by: Jens Axboe