aboutsummaryrefslogtreecommitdiff
path: root/drivers/cdrom
AgeCommit message (Collapse)AuthorFilesLines
2010-08-07block: push down BKL into .locked_ioctlArnd Bergmann2-4/+18
As a preparation for the removal of the big kernel lock in the block layer, this removes the BKL from the common ioctl handling code, moving it into every single driver still using it. Signed-off-by: Arnd Bergmann <[email protected]> Acked-by: Christoph Hellwig <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2010-08-07drivers/cdrom: use pr_<level>Joe Perches3-83/+73
- add pr_fmt. - convert printks to pr_<level> - add if (0) and printf argument checking to cdinfo - coalesce consecutive printks to single pr_ - fix a typo "back ground" to "background" - convert printks without level to pr_info - remove VIOCD_ prefixes and use pr_fmt/pr_<level> - add a missing newline to an OS/400 message Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Folded in tab indentation fix from Andrew. Signed-off-by: Jens Axboe <[email protected]>
2010-08-07block: remove wrappers for request type/flagsChristoph Hellwig2-2/+2
Remove all the trivial wrappers for the cmd_type and cmd_flags fields in struct requests. This allows much easier grepping for different request types instead of unwinding through macros. Signed-off-by: Christoph Hellwig <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2010-05-18of: Always use 'struct device.of_node' to get device node pointer.Grant Likely1-1/+1
The following structure elements duplicate the information in 'struct device.of_node' and so are being eliminated. This patch makes all readers of these elements use device.of_node instead. (struct of_device *)->node (struct dev_archdata *)->prom_node (sparc) (struct dev_archdata *)->of_node (powerpc & microblaze) Signed-off-by: Grant Likely <[email protected]>
2010-02-26block: Consolidate phys_segment and hw_segment limitsMartin K. Petersen2-3/+2
Except for SCSI no device drivers distinguish between physical and hardware segment limits. Consolidate the two into a single segment limit. Signed-off-by: Martin K. Petersen <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2010-02-26block: Rename blk_queue_max_sectors to blk_queue_max_hw_sectorsMartin K. Petersen1-1/+1
The block layer calling convention is blk_queue_<limit name>. blk_queue_max_sectors predates this practice, leading to some confusion. Rename the function to appropriately reflect that its intended use is to set max_hw_sectors. Also introduce a temporary wrapper for backwards compability. This can be removed after the merge window is closed. Signed-off-by: Martin K. Petersen <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2009-12-09Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6Linus Torvalds1-5/+5
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (137 commits) sh: include empty zero page in romImage sh: Make associative cache writes fatal on all SH-4A parts. sh: Drop associative writes for SH-4 cache flushes. sh: Partial revert of copy/clear_user_highpage() optimizations. sh: Add default uImage rule for se7724, ap325rxa, and migor. sh: allow runtime pm without suspend/resume callbacks sh: mach-ecovec24: Remove un-defined settings for VPU sh: mach-ecovec24: LCDC drive ability become high sh: fix sh7724 VEU3F resource size serial: sh-sci: Fix too early port disabling. sh: pfc: pr_info() -> pr_debug() cleanups. sh: pfc: Convert from ctrl_xxx() to __raw_xxx() I/O routines. sh: Improve kfr2r09 serial port setup code sh: Break out SuperH PFC code sh: Move KEYSC header file sh: convert /proc/cpu/aligmnent, /proc/cpu/kernel_alignment to seq_file sh: Add CPG save/restore code for sh7724 R-standby sh: Add SDHI power control support to Ecovec mfd: Add power control platform data to SDHI driver sh: mach-ecovec24: modify address map ...
2009-11-18sysctl: Drop & in front of every proc_handler.Eric W. Biederman1-6/+6
For consistency drop & in front of every proc_handler. Explicity taking the address is unnecessary and it prevents optimizations like stubbing the proc_handlers to NULL. Cc: Alexey Dobriyan <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Joe Perches <[email protected]> Signed-off-by: Eric W. Biederman <[email protected]>
2009-11-12sysctl drivers: Remove dead binary sysctl supportEric W. Biederman1-5/+3
Now that sys_sysctl is a wrapper around /proc/sys all of the binary sysctl support elsewhere in the tree is dead code. Cc: Jens Axboe <[email protected]> Cc: Corey Minyard <[email protected]> Cc: Greg Kroah-Hartman <[email protected]> Cc: Matt Mackall <[email protected]> Cc: Herbert Xu <[email protected]> Cc: Neil Brown <[email protected]> Cc: "James E.J. Bottomley" <[email protected]> Acked-by: Clemens Ladisch <[email protected]> for drivers/char/hpet.c Signed-off-by: Eric W. Biederman <[email protected]>
2009-10-13cdrom: gdrom: Kill off PHYSADDR use.Paul Mundt1-5/+5
PHYSADDR() is gone, and completely unecessary in all of the cases the gdrom driver was using it. Kill off all references to it, and change the one legitimate use over to virt_to_phys() instead. Signed-off-by: Paul Mundt <[email protected]>
2009-09-24sysctl: remove "struct file *" argument of ->proc_handlerAlexey Dobriyan1-4/+4
It's unused. It isn't needed -- read or write flag is already passed and sysctl shouldn't care about the rest. It _was_ used in two places at arch/frv for some reason. Signed-off-by: Alexey Dobriyan <[email protected]> Cc: David Howells <[email protected]> Cc: "Eric W. Biederman" <[email protected]> Cc: Al Viro <[email protected]> Cc: Ralf Baechle <[email protected]> Cc: Martin Schwidefsky <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: "David S. Miller" <[email protected]> Cc: James Morris <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2009-09-22const: make block_device_operations constAlexey Dobriyan2-2/+2
Signed-off-by: Alexey Dobriyan <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2009-05-22block: Use accessor functions for queue limitsMartin K. Petersen1-2/+2
Convert all external users of queue limits to using wrapper functions instead of poking the request queue variables directly. Signed-off-by: Martin K. Petersen <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2009-05-22block: Do away with the notion of hardsect_sizeMartin K. Petersen2-3/+3
Until now we have had a 1:1 mapping between storage device physical block size and the logical block sized used when addressing the device. With SATA 4KB drives coming out that will no longer be the case. The sector size will be 4KB but the logical block size will remain 512-bytes. Hence we need to distinguish between the physical block size and the logical ditto. This patch renames hardsect_size to logical_block_size. Signed-off-by: Martin K. Petersen <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2009-05-22Merge branch 'master' into for-2.6.31Jens Axboe1-1/+1
Conflicts: drivers/ide/ide-io.c Signed-off-by: Jens Axboe <[email protected]>
2009-05-20cdrom: beyond ARRAY_SIZE of viocd_diskinfoRoel Kluin1-1/+1
Do not go beyond ARRAY_SIZE of viocd_diskinfo Signed-off-by: Roel Kluin <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2009-05-11block: implement and enforce request peek/start/fetchTejun Heo2-6/+2
Till now block layer allowed two separate modes of request execution. A request is always acquired from the request queue via elv_next_request(). After that, drivers are free to either dequeue it or process it without dequeueing. Dequeue allows elv_next_request() to return the next request so that multiple requests can be in flight. Executing requests without dequeueing has its merits mostly in allowing drivers for simpler devices which can't do sg to deal with segments only without considering request boundary. However, the benefit this brings is dubious and declining while the cost of the API ambiguity is increasing. Segment based drivers are usually for very old or limited devices and as converting to dequeueing model isn't difficult, it doesn't justify the API overhead it puts on block layer and its more modern users. Previous patches converted all block low level drivers to dequeueing model. This patch completes the API transition by... * renaming elv_next_request() to blk_peek_request() * renaming blkdev_dequeue_request() to blk_start_request() * adding blk_fetch_request() which is combination of peek and start * disallowing completion of queued (not started) requests * applying new API to all LLDs Renamings are for consistency and to break out of tree code so that it's apparent that out of tree drivers need updating. [ Impact: block request issue API cleanup, no functional change ] Signed-off-by: Tejun Heo <[email protected]> Cc: Rusty Russell <[email protected]> Cc: James Bottomley <[email protected]> Cc: Mike Miller <[email protected]> Cc: unsik Kim <[email protected]> Cc: Paul Clements <[email protected]> Cc: Tim Waugh <[email protected]> Cc: Geert Uytterhoeven <[email protected]> Cc: David S. Miller <[email protected]> Cc: Laurent Vivier <[email protected]> Cc: Jeff Garzik <[email protected]> Cc: Jeremy Fitzhardinge <[email protected]> Cc: Grant Likely <[email protected]> Cc: Adrian McMenamin <[email protected]> Cc: Stephen Rothwell <[email protected]> Cc: Bartlomiej Zolnierkiewicz <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: Sergei Shtylyov <[email protected]> Cc: Alex Dubov <[email protected]> Cc: Pierre Ossman <[email protected]> Cc: David Woodhouse <[email protected]> Cc: Markus Lidel <[email protected]> Cc: Stefan Weinhuber <[email protected]> Cc: Martin Schwidefsky <[email protected]> Cc: Pete Zaitcev <[email protected]> Cc: FUJITA Tomonori <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2009-05-11gdrom: dequeue in-flight requestTejun Heo1-15/+13
gdrom already dequeues and fully completes requests on normal path and the error paths can be easily converted to do so too. Clean it up and dequeue requests on error paths too. While at it remove superflous blk_fs_request() && !blk_rq_sectors() condition check. [ Impact: dequeue in-flight request, cleanup ] Signed-off-by: Tejun Heo <[email protected]> Cc: Adrian McMenamin <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2009-05-11block: convert to dequeueing model (easy ones)Tejun Heo1-0/+2
plat-omap/mailbox, floppy, viocd, mspro_block, i2o_block and mmc/card/queue are already pretty close to dequeueing model and can be converted with simple changes. Convert them. While at it, * xen-blkfront: !fs check moved downwards to share dequeue call with normal path. * mspro_block: __blk_end_request(..., blk_rq_cur_byte()) converted to __blk_end_request_cur() * mmc/card/queue: loop of __blk_end_request() converted to __blk_end_request_all() [ Impact: dequeue in-flight request ] Signed-off-by: Tejun Heo <[email protected]> Cc: Rusty Russell <[email protected]> Cc: Jeremy Fitzhardinge <[email protected]> Cc: Stephen Rothwell <[email protected]> Cc: Alex Dubov <[email protected]> Cc: Markus Lidel <[email protected]> Cc: Pierre Ossman <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2009-05-11block: convert to pos and nr_sectors accessorsTejun Heo2-4/+4
With recent cleanups, there is no place where low level driver directly manipulates request fields. This means that the 'hard' request fields always equal the !hard fields. Convert all rq->sectors, nr_sectors and current_nr_sectors references to accessors. While at it, drop superflous blk_rq_pos() < 0 test in swim.c. [ Impact: use pos and nr_sectors accessors ] Signed-off-by: Tejun Heo <[email protected]> Acked-by: Geert Uytterhoeven <[email protected]> Tested-by: Grant Likely <[email protected]> Acked-by: Grant Likely <[email protected]> Tested-by: Adrian McMenamin <[email protected]> Acked-by: Adrian McMenamin <[email protected]> Acked-by: Mike Miller <[email protected]> Cc: James Bottomley <[email protected]> Cc: Bartlomiej Zolnierkiewicz <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: Sergei Shtylyov <[email protected]> Cc: Eric Moore <[email protected]> Cc: Alan Stern <[email protected]> Cc: FUJITA Tomonori <[email protected]> Cc: Pete Zaitcev <[email protected]> Cc: Stephen Rothwell <[email protected]> Cc: Paul Clements <[email protected]> Cc: Tim Waugh <[email protected]> Cc: Jeff Garzik <[email protected]> Cc: Jeremy Fitzhardinge <[email protected]> Cc: Alex Dubov <[email protected]> Cc: David Woodhouse <[email protected]> Cc: Martin Schwidefsky <[email protected]> Cc: Dario Ballabio <[email protected]> Cc: David S. Miller <[email protected]> Cc: Rusty Russell <[email protected]> Cc: unsik Kim <[email protected]> Cc: Laurent Vivier <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2009-04-28block: replace end_request() with [__]blk_end_request_cur()Tejun Heo1-3/+3
end_request() has been kept around for backward compatibility; however, it's about time for it to go away. * There aren't too many users left. * Its use of @updtodate is pretty confusing. * In some cases, newer code ends up using mixture of end_request() and [__]blk_end_request[_all](), which is way too confusing. So, add [__]blk_end_request_cur() and replace end_request() with it. Most conversions are straightforward. Noteworthy ones are... * paride/pcd: next_request() updated to take 0/-errno instead of 1/0. * paride/pf: pf_end_request() and next_request() updated to take 0/-errno instead of 1/0. * xd: xd_readwrite() updated to return 0/-errno instead of 1/0. * mtd/mtd_blkdevs: blktrans_discard_request() updated to return 0/-errno instead of 1/0. Unnecessary local variable res initialization removed from mtd_blktrans_thread(). [ Impact: cleanup ] Signed-off-by: Tejun Heo <[email protected]> Acked-by: Joerg Dorchain <[email protected]> Acked-by: Geert Uytterhoeven <[email protected]> Acked-by: Grant Likely <[email protected]> Acked-by: Laurent Vivier <[email protected]> Cc: Tim Waugh <[email protected]> Cc: Stephen Rothwell <[email protected]> Cc: Paul Mackerras <[email protected]> Cc: Jeremy Fitzhardinge <[email protected]> Cc: Markus Lidel <[email protected]> Cc: David Woodhouse <[email protected]> Cc: Pete Zaitcev <[email protected]> Cc: unsik Kim <[email protected]>
2009-04-28block: implement and use [__]blk_end_request_all()Tejun Heo2-22/+5
There are many [__]blk_end_request() call sites which call it with full request length and expect full completion. Many of them ensure that the request actually completes by doing BUG_ON() the return value, which is awkward and error-prone. This patch adds [__]blk_end_request_all() which takes @rq and @error and fully completes the request. BUG_ON() is added to to ensure that this actually happens. Most conversions are simple but there are a few noteworthy ones. * cdrom/viocd: viocd_end_request() replaced with direct calls to __blk_end_request_all(). * s390/block/dasd: dasd_end_request() replaced with direct calls to __blk_end_request_all(). * s390/char/tape_block: tapeblock_end_request() replaced with direct calls to blk_end_request_all(). [ Impact: cleanup ] Signed-off-by: Tejun Heo <[email protected]> Cc: Russell King <[email protected]> Cc: Stephen Rothwell <[email protected]> Cc: Mike Miller <[email protected]> Cc: Martin Schwidefsky <[email protected]> Cc: Jeff Garzik <[email protected]> Cc: Rusty Russell <[email protected]> Cc: Jeremy Fitzhardinge <[email protected]> Cc: Alex Dubov <[email protected]> Cc: James Bottomley <[email protected]>
2008-12-29cdrom: reduce stack usage of mmc_ioctl_dvd_read_structMarcin Slusarz1-62/+77
1. kmalloc 192 bytes in dvd_read_bca (which is inlined into dvd_read_struct) 2. Pass struct packet_command to all dvd_read_* functions. Checkstack output: Before: mmc_ioctl_dvd_read_struct: 280 After: mmc_ioctl_dvd_read_struct: 56 Signed-off-by: Marcin Slusarz <[email protected]> Cc: Bartlomiej Zolnierkiewicz <[email protected]> Cc: Andrew Morton <[email protected]> Cc: Jens Axboe <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2008-12-29cdrom: split mmc_ioctl to lower stack usageMarcin Slusarz1-241/+329
Checkstack output: Before: mmc_ioctl: 584 After: mmc_ioctl_dvd_read_struct: 280 mmc_ioctl_cdrom_subchannel: 152 mmc_ioctl_cdrom_read_data: 120 mmc_ioctl_cdrom_volume: 104 mmc_ioctl_cdrom_read_audio: 104 (mmc_ioctl is inlined into cdrom_ioctl - 104 bytes) Signed-off-by: Marcin Slusarz <[email protected]> Cc: Bartlomiej Zolnierkiewicz <[email protected]> Cc: Andrew Morton <[email protected]> Cc: Jens Axboe <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2008-12-12Commands needing to be retried require a complete re-initialization.Alan D. Brunelle1-6/+10
The test-unit-ready portion of this patch was causing boots to fail on my test machine (as in http://lkml.org/lkml/2008/12/5/161). With this patch in place, the system is booting reliably. Mike Anderson found the same problem in the hp_hw_start_stop code, and I applied the same solution in cdrom_read_cdda_bpc. Signed-off-by: Alan D. Brunelle <[email protected]> Cc: Mike Anderson <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2008-10-28gdrom: Fix compile errorNobuhiro Iwamatsu1-2/+3
Return value and argument of block_device_operations.release of gdrom was changed. This patch fix this problem. Signed-off-by: Nobuhiro Iwamatsu <[email protected]> Acked-by: Al Viro <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2008-10-21[PATCH] switch viocdAl Viro1-13/+12
Signed-off-by: Al Viro <[email protected]>
2008-10-21[PATCH] switch gdromAl Viro1-10/+9
Signed-off-by: Al Viro <[email protected]>
2008-10-21[PATCH] beginning of methods conversionAl Viro2-6/+6
To keep the size of changesets sane we split the switch by drivers; to keep the damn thing bisectable we do the following: 1) rename the affected methods, add ones with correct prototypes, make (few) callers handle both. That's this changeset. 2) for each driver convert to new methods. *ALL* drivers are converted in this series. 3) kill the old (renamed) methods. Note that it _is_ a flagday; all in-tree drivers are converted and by the end of this series no trace of old methods remain. The only reason why we do that this way is to keep the damn thing bisectable and allow per-driver debugging if anything goes wrong. New methods: open(bdev, mode) release(disk, mode) ioctl(bdev, mode, cmd, arg) /* Called without BKL */ compat_ioctl(bdev, mode, cmd, arg) locked_ioctl(bdev, mode, cmd, arg) /* Called with BKL, legacy */ Signed-off-by: Al Viro <[email protected]>
2008-10-21[PATCH] switch cdrom_{open,release,ioctl} to sane APIsAl Viro3-18/+20
... convert to it in callers Signed-off-by: Al Viro <[email protected]>
2008-10-21[PATCH] switch scsi_cmd_ioctl() to passing fmode_tAl Viro1-1/+1
Signed-off-by: Al Viro <[email protected]>
2008-10-21[PATCH] eliminate use of ->f_flags in block methodsAl Viro1-2/+2
store needed information in f_mode Signed-off-by: Al Viro <[email protected]>
2008-10-09gdrom: change to use __blk_end_request()Kiyoshi Ueda1-2/+2
This patch converts gdrom to use __blk_end_request() directly so that end_{queued|dequeued}_request() can be removed. gd.transfer is '1' in error cases and '0' in non-error cases, so gdrom hasn't been propagating any error code to the block layer. We can just convert error cases to '-EIO'. Signed-off-by: Kiyoshi Ueda <[email protected]> Signed-off-by: Jun'ichi Nomura <[email protected]> Cc: Adrian McMenamin <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2008-10-09block: introduce struct rq_map_data to use reserved pagesFUJITA Tomonori1-1/+1
This patch introduces struct rq_map_data to enable bio_copy_use_iov() use reserved pages. Currently, bio_copy_user_iov allocates bounce pages but drivers/scsi/sg.c wants to allocate pages by itself and use them. struct rq_map_data can be used to pass allocated pages to bio_copy_user_iov. The current users of bio_copy_user_iov simply passes NULL (they don't want to use pre-allocated pages). Signed-off-by: FUJITA Tomonori <[email protected]> Cc: Jens Axboe <[email protected]> Cc: Douglas Gilbert <[email protected]> Cc: Mike Christie <[email protected]> Cc: James Bottomley <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2008-10-09block: add gfp_mask argument to blk_rq_map_user and blk_rq_map_user_iovFUJITA Tomonori1-1/+1
Currently, blk_rq_map_user and blk_rq_map_user_iov always do GFP_KERNEL allocation. This adds gfp_mask argument to blk_rq_map_user and blk_rq_map_user_iov so sg can use it (sg always does GFP_ATOMIC allocation). Signed-off-by: FUJITA Tomonori <[email protected]> Signed-off-by: Douglas Gilbert <[email protected]> Cc: Mike Christie <[email protected]> Cc: James Bottomley <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2008-08-18cdrom: handle TOCAlexander Inyukhin1-7/+0
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 <[email protected]> Cc: Jens Axboe <[email protected]> Cc: Borislav Petkov <[email protected]> Signed-off-by: Andrew Morton <[email protected]> [bart: remove now unneeded ->audio_ioctl check (noticed by Borislav)] Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
2008-08-18gdrom: add dummy audio_ioctl handlerBorislav Petkov1-0/+7
Make sure audio_ioctl is always defined even if being a dummy function since the cdrom_ioctl interface assumes its existence and we don't want to BUG on null ptr on some ioctls like, e.g. CDROMREADTOCENTRY, CDROMREADTOCHDR etc. when we fix CDC_PLAY_AUDIO checking in cdrom.c. Signed-off-by: Borislav Petkov <[email protected]> Acked-by: Adrian McMenamin <[email protected]> Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
2008-08-18viocd: add dummy audio ioctl handlerBorislav Petkov1-0/+7
Make sure audio_ioctl is always defined even if being a dummy function since the cdrom_ioctl interface assumes its existence and we don't want to BUG on null ptr on some ioctls like, e.g. CDROMREADTOCENTRY, CDROMREADTOCHDR etc. when we fix CDC_PLAY_AUDIO checking in cdrom.c. Signed-off-by: Borislav Petkov <[email protected]> Acked-by: Stephen Rothwell <[email protected]> Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
2008-08-05cdrom: don't check CDC_PLAY_AUDIO in cdrom_count_tracks()Tejun Heo1-4/+0
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 <[email protected]> Acked-by: Jens Axboe <[email protected]> Cc: Borislav Petkov <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
2008-07-29sh: More header path fixups for mach dir refactoring.Paul Mundt1-2/+2
Signed-off-by: Paul Mundt <[email protected]>
2008-07-04cdrom: revert commit 22a9189 (cdrom: use kmalloced buffers instead of ↵FUJITA Tomonori1-181/+93
buffers on stack) 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 <[email protected]> Cc: Thomas Bogendoerfer <[email protected]> Cc: Bartlomiej Zolnierkiewicz <[email protected]> Cc: Thomas Bogendoerfer <[email protected]> Cc: Tejun Heo <[email protected]> Cc: James Bottomley <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2008-05-23[POWERPC] iSeries: Remove unused mail addressStephen Rothwell1-1/+1
I don't use my IBM email address normally and people can find me in CREDITS. Signed-off-by: Stephen Rothwell <[email protected]> Signed-off-by: Paul Mackerras <[email protected]>
2008-04-29Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-blockLinus Torvalds1-1/+0
* 'for-linus' of git://git.kernel.dk/linux-2.6-block: block: Skip I/O merges when disabled block: add large command support block: replace sizeof(rq->cmd) with BLK_MAX_CDB ide: use blk_rq_init() to initialize the request block: use blk_rq_init() to initialize the request block: rename and export rq_init() block: no need to initialize rq->cmd with blk_get_request block: no need to initialize rq->cmd in prepare_flush_fn hook block/blk-barrier.c:blk_ordered_cur_seq() mustn't be inline block/elevator.c:elv_rq_merge_ok() mustn't be inline block: make queue flags non-atomic block: add dma alignment and padding support to blk_rq_map_kern unexport blk_max_pfn ps3disk: Remove superfluous cast block: make rq_init() do a full memset() relay: fix splice problem
2008-04-29drivers: use non-racy method for proc entries creation (2)Denis V. Lunev1-7/+3
Use proc_create()/proc_create_data() to make sure that ->proc_fops and ->data be setup before gluing PDE to main tree. Signed-off-by: Denis V. Lunev <[email protected]> Cc: Greg Kroah-Hartman <[email protected]> Cc: Alexey Dobriyan <[email protected]> Cc: "Eric W. Biederman" <[email protected]> Cc: Peter Osterlund <[email protected]> Cc: Bartlomiej Zolnierkiewicz <[email protected]> Cc: Dmitry Torokhov <[email protected]> Cc: Neil Brown <[email protected]> Cc: Mauro Carvalho Chehab <[email protected]> Cc: Bjorn Helgaas <[email protected]> Cc: Alessandro Zummo <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-04-29block: no need to initialize rq->cmd with blk_get_requestFUJITA Tomonori1-1/+0
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 <[email protected]> Cc: James Bottomley <[email protected]> Cc: Alasdair G Kergon <[email protected]> Cc: Jens Axboe <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2008-04-21cdrom: use kmalloced buffers instead of buffers on stackThomas Bogendoerfer1-93/+181
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 <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2008-04-21cdrom: make unregister_cdrom() return voidAkinobu Mita3-7/+5
Now unregister_cdrom() always returns 0. Make it return void and update all callers that check the return value. Signed-off-by: Akinobu Mita <[email protected]> Cc: Adrian McMenamin <[email protected]> Cc: Borislav Petkov <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2008-04-21cdrom: use list_head for cdrom_device_info listAkinobu Mita1-23/+6
Use list_head for cdrom_device_info list instead of opencoded singly list handling. Signed-off-by: Akinobu Mita <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2008-04-21cdrom: protect cdrom_device_info list by mutexAkinobu Mita1-0/+2
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 <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2008-04-21cdrom: cleanup hardcoded error-codeAkinobu Mita1-1/+1
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 <[email protected]> Signed-off-by: Jens Axboe <[email protected]>