Merge branch 'splice-2.6.23' of git://git.kernel.dk/data/git/linux-2.6-block
* '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
Showing
- Documentation/DocBook/kernel-api.tmpl 11 additions, 0 deletionsDocumentation/DocBook/kernel-api.tmpl
- drivers/block/loop.c 44 additions, 20 deletionsdrivers/block/loop.c
- drivers/char/mem.c 1 addition, 1 deletiondrivers/char/mem.c
- fs/adfs/file.c 1 addition, 1 deletionfs/adfs/file.c
- fs/affs/file.c 1 addition, 1 deletionfs/affs/file.c
- fs/afs/file.c 1 addition, 1 deletionfs/afs/file.c
- fs/bad_inode.c 0 additions, 7 deletionsfs/bad_inode.c
- fs/bfs/file.c 1 addition, 1 deletionfs/bfs/file.c
- fs/block_dev.c 0 additions, 1 deletionfs/block_dev.c
- fs/cifs/cifsfs.c 4 additions, 4 deletionsfs/cifs/cifsfs.c
- fs/coda/file.c 6 additions, 5 deletionsfs/coda/file.c
- fs/ecryptfs/file.c 8 additions, 7 deletionsfs/ecryptfs/file.c
- fs/ext2/file.c 0 additions, 2 deletionsfs/ext2/file.c
- fs/ext3/file.c 0 additions, 1 deletionfs/ext3/file.c
- fs/ext4/file.c 0 additions, 1 deletionfs/ext4/file.c
- fs/fat/file.c 1 addition, 1 deletionfs/fat/file.c
- fs/fuse/file.c 2 additions, 2 deletionsfs/fuse/file.c
- fs/gfs2/ops_file.c 0 additions, 1 deletionfs/gfs2/ops_file.c
- fs/hfs/inode.c 1 addition, 1 deletionfs/hfs/inode.c
- fs/hfsplus/inode.c 1 addition, 1 deletionfs/hfsplus/inode.c
Loading
Please register or sign in to comment