summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'splice-2.6.23' of git://git.kernel.dk/data/git/linux-2.6-blockLinus Torvalds2007-07-1056-459/+874
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'splice-2.6.23' of git://git.kernel.dk/data/git/linux-2.6-block: pipe: add documentation and comments pipe: change the ->pin() operation to ->confirm() Remove remnants of sendfile() xip sendfile removal splice: completely document external interface with kerneldoc sendfile: remove bad_sendfile() from bad_file_ops shmem: convert to using splice instead of sendfile() relay: use splice_to_pipe() instead of open-coding the pipe loop pipe: allow passing around of ops private pointer splice: divorce the splice structure/function definitions from the pipe header splice: relay support sendfile: convert nfsd to splice_direct_to_actor() sendfile: convert nfs to using splice_read() loop: convert to using splice_direct_to_actor() instead of sendfile() splice: add void cookie to the actor data sendfile: kill generic_file_sendfile() sendfile: remove .sendfile from filesystems that use generic_file_sendfile() sys_sendfile: switch to using ->splice_read, if available vmsplice: add vmsplice-to-user support splice: abstract out actor data
| * pipe: add documentation and commentsJens Axboe2007-07-103-2/+140
| | | | | | | | | | | | | | | | As per Andrew Mortons request, here's a set of documentation for the generic pipe_buf_operations hooks, the pipe, and pipe_buffer structures. Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
| * pipe: change the ->pin() operation to ->confirm()Jens Axboe2007-07-107-20/+22
| | | | | | | | | | | | | | | | | | | | | | | | The name 'pin' was badly chosen, it doesn't pin a pipe buffer in the most commonly used sense in the kernel. So change the name to 'confirm', after debating this issue with Hugh Dickins a bit. A good return from ->confirm() means that the buffer is really there, and that the contents are good. Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
| * Remove remnants of sendfile()Jens Axboe2007-07-102-17/+12
| | | | | | | | | | | | | | There are now zero users of .sendfile() in the kernel, so kill it from the file_operations structure and in do_sendfile(). Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
| * xip sendfile removalCarsten Otte2007-07-103-26/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch removes xip_file_sendfile, the sendfile implementation for xip without replacement. Those customers that use xip on s390 are not using sendfile() as far as we know, and so far s390 is the only platform this could potentially be used on so far. Having sendfile is not a popular feature for execute in place file systems, however we have a working implementation of splice_read() based on fs/splice.c if anyone asks for it. At this point in time, it does not seem preferable to merge splice_read() for xip because it causes extra maintenence effort due to code duplication and it requires struct page behind the xip memory segment. We'd like to get rid of that in favor of supporting flash based embedded platforms (Monta Vista work) soon. Signed-off-by: Carsten Otte <cotte@de.ibm.com> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
| * splice: completely document external interface with kerneldocJens Axboe2007-07-102-24/+96
| | | | | | | | | | | | | | Also add fs/splice.c as a kerneldoc target with a smaller blurb that should be expanded to better explain the overview of splice. Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
| * sendfile: remove bad_sendfile() from bad_file_opsJens Axboe2007-07-101-7/+0
| | | | | | | | | | | | | | do_sendfile() prefers splice over sendfile, so it should not trigger (directly, at least). Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
| * shmem: convert to using splice instead of sendfile()Hugh Dickins2007-07-101-25/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | Remove shmem_file_sendfile and resurrect shmem_readpage, as used by tmpfs to support loop and sendfile in 2.4 and 2.5. Now tmpfs can support splice, loop and sendfile in the simplest way, using generic_file_splice_read and generic_file_splice_write (with the aid of shmem_prepare_write). We could make some efficiency tweaks later, if there's a real need; but this is stable and works well as is. Signed-off-by: Hugh Dickins <hugh@veritas.com> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
| * relay: use splice_to_pipe() instead of open-coding the pipe loopJens Axboe2007-07-101-91/+55
| | | | | | | | | | | | | | | | | | | | It cleans up the relay splice implementation a lot, and gets rid of a lot of internal pipe knowledge that should not be in there. Plus fixes for padding and partial first page (and lots more) from Tom Zanussi. Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
| * pipe: allow passing around of ops private pointerJens Axboe2007-07-103-0/+3
| | | | | | | | | | | | | | | | relay needs this for proper consumption handling, and the network receive support needs it as well to lookup the sk_buff on pipe release. Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
| * splice: divorce the splice structure/function definitions from the pipe headerJens Axboe2007-07-109-68/+83
| | | | | | | | | | | | | | | | | | We need to move even more stuff into the header so that folks can use the splice_to_pipe() implementation instead of open-coding a lot of pipe knowledge (see relay implementation), so move to our own header file finally. Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
| * splice: relay supportTom Zanussi2007-07-101-50/+191
| | | | | | | | Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
| * sendfile: convert nfsd to splice_direct_to_actor()Jens Axboe2007-07-104-19/+34
| | | | | | | | Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
| * sendfile: convert nfs to using splice_read()Jens Axboe2007-07-101-6/+9
| | | | | | | | | | Acked-by: Trond Myklebust <trond.myklebust@fys.uio.no> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
| * loop: convert to using splice_direct_to_actor() instead of sendfile()Jens Axboe2007-07-101-20/+44
| | | | | | | | | | | | | | | | | | This gets rid of the dependency on ->sendfile() for receiving data and converts loop to ->splice_read() instead. Also includes an IV offset fix from Hugh Dickins. Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
| * splice: add void cookie to the actor dataJens Axboe2007-07-101-0/+1
| | | | | | | | | | | | We need that for passing driver private info. Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
| * sendfile: kill generic_file_sendfile()Jens Axboe2007-07-102-21/+0
| | | | | | | | | | | | It's no longer used. Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
| * sendfile: remove .sendfile from filesystems that use generic_file_sendfile()Jens Axboe2007-07-1037-131/+43
| | | | | | | | | | | | | | They can use generic_file_splice_read() instead. Since sys_sendfile() now prefers that, there should be no change in behaviour. Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
| * sys_sendfile: switch to using ->splice_read, if availableJens Axboe2007-07-101-4/+20
| | | | | | | | | | | | | | This patch makes sendfile prefer to use ->splice_read(), if it's available in the file_operations structure. Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
| * vmsplice: add vmsplice-to-user supportJens Axboe2007-07-103-30/+158
| | | | | | | | | | | | | | | | A bit of a cheat, it actually just copies the data to userspace. But this makes the interface nice and symmetric and enables people to build on splice, with room for future improvement in performance. Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
| * splice: abstract out actor dataJens Axboe2007-07-103-36/+84
| | | | | | | | | | | | | | | | | | | | | | | | For direct splicing (or private splicing), the output may not be a file. So abstract out the handling into a specified actor function and put the data in the splice_desc structure earlier, so we can build on top of that. This is the first step in better splice handling for drivers, and also for implementing vmsplice _to_ user memory. Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
* | Merge branch 'trivial-2.6.23' of git://git.kernel.dk/data/git/linux-2.6-blockLinus Torvalds2007-07-1042-26865/+192
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'trivial-2.6.23' of git://git.kernel.dk/data/git/linux-2.6-block: Documentation/block/barrier.txt is not in sync with the actual code: - blk_queue_ordered() no longer has a gfp_mask parameter - blk_queue_ordered_locked() no longer exists - sd_prepare_flush() looks slightly different Use list_for_each_entry() instead of list_for_each() in the block device Make a "menuconfig" out of the Kconfig objects "menu, ..., endmenu", block/Kconfig already has its own "menuconfig" so remove these Use menuconfigs instead of menus, so the whole menu can be disabled at once cfq-iosched: fix async queue behaviour unexport bio_{,un}map_user Remove legacy CDROM drivers [PATCH] fix request->cmd == INT cases cciss: add new controller support for P700m [PATCH] Remove acsi.c [BLOCK] drop unnecessary bvec rewinding from flush_dry_bio_endio [PATCH] cdrom_sysctl_info fix blk_hw_contig_segment(): bad segment size checks [TRIVIAL PATCH] Kill blk_congestion_wait() stub for !CONFIG_BLOCK
| * | Documentation/block/barrier.txt is not in sync with the actual code: - ↵Geert Uytterhoeven2007-07-101-13/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | blk_queue_ordered() no longer has a gfp_mask parameter - blk_queue_ordered_locked() no longer exists - sd_prepare_flush() looks slightly different Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com> Acked-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
| * | Use list_for_each_entry() instead of list_for_each() in the block deviceMatthias Kaehlcke2007-07-101-10/+3
| | | | | | | | | | | | | | | | | | | | | | | | elevator Signed-off-by: Matthias Kaehlcke <matthias.kaehlcke@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
| * | Make a "menuconfig" out of the Kconfig objects "menu, ..., endmenu",Jan Engelhardt2007-07-101-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | so that the user can disable all the options in that menu at once instead of having to disable each option separately. Signed-off-by: Jan Engelhardt <jengelh@gmx.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
| * | block/Kconfig already has its own "menuconfig" so remove theseJan Engelhardt2007-07-101-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | "menu, endmenu" that did not get cleaned up in the block patch [ http://lkml.org/lkml/2007/4/10/251 ] Signed-off-by: Jan Engelhardt <jengelh@gmx.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
| * | Use menuconfigs instead of menus, so the whole menu can be disabled at onceJan Engelhardt2007-07-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | instead of going through all options. Signed-off-by: Jan Engelhardt <jengelh@gmx.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
| * | cfq-iosched: fix async queue behaviourJens Axboe2007-07-102-5/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the cfq_queue hash removal, we inadvertently got rid of the async queue sharing. This was not intentional, in fact CFQ purposely shares the async queue per priority level to get good merging for async writes. So put some logic in cfq_get_queue() to track the shared queues. Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
| * | unexport bio_{,un}map_userAdrian Bunk2007-07-101-2/+0
| | | | | | | | | | | | | | | | | | | | | bio_{,un}map_user no longer have any modular users. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
| * | Remove legacy CDROM driversJens Axboe2007-07-1023-24847/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They are all broken beyond repair. Given that nobody has complained about them (most haven't worked in 2.6 AT ALL), remove them from the tree. A new mitsumi driver that actually works is in progress, it'll get added when completed. Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
| * | [PATCH] fix request->cmd == INT casesBoaz Harrosh2007-07-1011-20/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - I have unearthed very old bugs in stale drivers that still used request->cmd as a READ|WRITE int - This patch is maybe a proof that these drivers have not been used for a long time. Should they be removed completely? Drivers that currently do not work for sure: drivers/acorn/block/fd1772.c | 2 +- drivers/acorn/block/mfmhd.c | 8 ++++---- drivers/cdrom/aztcd.c | 2 +- drivers/cdrom/cm206.c | 2 +- drivers/cdrom/gscd.c | 2 +- drivers/cdrom/mcdx.c | 2 +- drivers/cdrom/optcd.c | 2 +- drivers/cdrom/sjcd.c | 2 +- Drivers with cosmetic fixes only: b/drivers/block/amiflop.c b/drivers/block/nbd.c b/drivers/ide/legacy/hd.c Signed-off-by: Boaz Harrosh <bharrosh@panasas.com> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
| * | cciss: add new controller support for P700mMike Miller (OS Dev2007-07-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for the Smart Array P700m SAS controller. This new controller will ship Fall 2007. Signed-off-by: Mike Miller <mike.miller@hp.com> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
| * | [PATCH] Remove acsi.cJens Axboe2007-07-103-1858/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Originally from Boaz Harrosh <bharrosh@panasas.com> It hasn't been working in 2.5 or 2.6 ever, since it's still buffer_head based. Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
| * | [BLOCK] drop unnecessary bvec rewinding from flush_dry_bio_endioTejun Heo2007-07-101-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Barrier bios are completed twice - once after the barrier write itself is done and again after the whole sequence is complete. flush_dry_bio_endio() is for the first completion. It doesn't really complete the bio. It rewinds bvec and resets bio so that it can be completed again when the whole barrier sequence is complete. The bvec rewinding code has the following problems. 1. The rewinding code is wrong because filesystems may pass bvec with non zero bv_offset. 2. The block layer doesn't guarantee anything about the state of bvec array on request completion. bv_offset and len are updated iff __end_that_request_first() completes the bvec partially. Because of #2, #1 doesn't really matter (nobody cares whether bvec is re-wound correctly or not) but then again by not doing unwinding at all, we'll always give back the same bvec to the caller as full bvec completion doesn't alter bvecs and the final completion is always full completion. Drop unnecessary rewinding code. This is spotted by Neil Brown. Signed-off-by: Tejun Heo <htejun@gmail.com> Cc: Neil Brown <neilb@suse.de> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
| * | [PATCH] cdrom_sysctl_info fixDave Young2007-07-101-91/+125
| | | | | | | | | | | | | | | | | | | | | | | | Fix the cdrom_sysctl_info possible buffer overwrite bug. Also fix the locking of accessing topCdromPtr pointer. Signed-off-by: Dave Young <hidave.darkstar@gmail.com> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
| * | blk_hw_contig_segment(): bad segment size checksJens Axboe2007-07-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two bugs in there: - The virt oversize check should use the current bio hardware back size and the next bio front size, not the same bio. Spotted by Neil Brown. - The segment size check should add hw front sizes, not total bio sizes. Spotted by James Bottomley Acked-by: James Bottomley <James.Bottomley@SteelEye.com> Acked-by: NeilBrown <neilb@suse.de> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
| * | [TRIVIAL PATCH] Kill blk_congestion_wait() stub for !CONFIG_BLOCKBenjamin Gilbert2007-07-101-5/+0
| |/ | | | | | | | | | | | | | | blk_congestion_wait() doesn't exist anymore, but there's still a stub in blkdev.h for the !CONFIG_BLOCK case. Kill it. Signed-off-by: Benjamin Gilbert <bgilbert@cs.cmu.edu> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
* | Input: tsdev - fix broken usec-to-millisecs conversionAndrew Morton2007-07-101-1/+1
| | | | | | | | | | | | | | Noted by Fengwei Yin <yfw.kernel@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: pxa27x_keyboard - fix compile errorMike Rapoport2007-07-101-1/+1
| | | | | | | | | | | | Signed-off-by: Mike Rapoport <mike@compulab.co.il> Acked-by: Rodolfo Giometti <giometti@linux.it> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: serio_raw - shut up errorneous warningAndrew Morton2007-07-101-1/+1
| | | | | | | | | | | | | | | | drivers/input/serio/serio_raw.c: In function 'serio_raw_read': drivers/input/serio/serio_raw.c:163: warning: 'c' may be used uninitialized in this function Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: update MAINTAINERS to explicitly mention touchscreensRobert P. J. Day2007-07-101-1/+1
| | | | | | | | | | Signed-off-by: Robert P. J. Day <rpjday@mindspring.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: atkbd - change mapping for e032 from KEY_WWW to KEY_HOMEPAGEHans de Goede2007-07-102-4/+4
| | | | | | | | | | | | | | | | | | | | WWW/Homepage key on Microsoft-compatible keyboards generates KEY_WWW when connected via PS/2 port but KEY_HOMEPAGE when connected via USB. This patch changes mapping in atkbd to match one in HID driver. Signed-off-by: Hans de Goede <j.w.r.degoede@hhs.nl> Acked-by: Vojtech Pavlik <vojtech@suse.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: usbtouchscreen - add support for IRTOUCHSYSTEMS touchscreensOndrej Zary2007-07-102-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for IRTOUCHSYSTEMS (or UNITOP) infrared touchscreens. The touchscreen sends data in 8-byte packets. BYTE 0 - unknown meaning, seen only one value: 0x54 BYTE 1 - unknown meaning, 3 lowest bits indicate touch state values seen: 0x81, 0x82 or 0x83 bit 0 = set if the screen is touched and was not touched before (touch bit 1 = set if the screen is touched and was touched (dragging) bit 2 = set if the touch was ended (release) BYTES 2 and 3 - X position, high-order-byte first, range = 0 to 0x0FFF BYTES 4 and 5 - Y position, high-order-byte first, range = 0 to 0x0FFF BYTE 6 - unknown meaning, seen only one value: 0xFF BYTE 7 - unknown meaning, seen only one value: 0x00 Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Daniel Ritz <daniel.ritz@gmx.ch> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: ppc-beep - switch to using input_dev->dev.parentDmitry Torokhov2007-07-101-5/+5
| | | | | | | | | | | | | | | | | | | | In preparation for struct class_device -> struct device input core conversion, switch to using input_dev->dev.parent when specifying device position in sysfs tree. Also, do not access input_dev->private directly, use helpers. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: xpad - fix report for dpad and inverted Y and RY axes on xbox 360Dmitry Torokhov2007-07-101-20/+20
| | | | | | | | | | | | | | | | | | Make the driver report Y/RY up as positive value and down as negative. Also make DPAD mapping the same as classic xpad. Reported-by: Brian Magnuson <bdmagnuson@gmail.com> Tested-by: Jan Kratochvil <honza@jikos.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: xpad - make xpad_play_effect() staticAdrian Bunk2007-07-101-1/+2
| | | | | | | | | | | | | | xpad_play_effect() does not need to be global. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: xpad - fix check for succesful usb_buffer_allocJan Kratochvil2007-07-101-1/+1
| | | | | | | | | | Signed-off-by: Jan Kratochvil <honza@jikos.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: grip-mp - use ARRAY_SIZEAndi Drebes2007-07-101-2/+2
| | | | | | | | | | Signed-off-by: Andi Drebes <lists-receive@programmierforen.de> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: wacom - add support for the new Bamboo tabletsPing Cheng2007-07-104-9/+53
| | | | | | | | | | Signed-off-by: Ping Cheng <pingc@wacom.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: add gpio-mouse driverHans-Christian Egtvedt2007-07-104-0/+274
| | | | | | | | | | | | | | | | | | | | | | | | Adds support for simulating a mouse using GPIO lines. The driver needs an appropriate platform device to be created by architecture code. The driver has been tested on AT32AP7000 microprocessor using the ATSTK1000 development board. Signed-off-by: Hans-Christian Egtvedt <hcegtvedt@atmel.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
View Lorry Controller Status