aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2007-07-27 02:08:51 -0400
committerJens Axboe <jens.axboe@oracle.com>2007-07-27 02:08:51 -0400
commit79685b8deea4541d18882d8c07d0e99e788292ab (patch)
tree07ef3cd834115451598b5988ca2074c7618bc809
parent7c2ff389bbb33074e7fde7a744f59da199a74af5 (diff)
docbook: add pipes, other fixes
Fix some typos in pipe.c and splice.c. Add pipes API to kernel-api.tmpl. Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
-rw-r--r--Documentation/DocBook/kernel-api.tmpl13
-rw-r--r--fs/pipe.c2
-rw-r--r--fs/splice.c4
3 files changed, 14 insertions, 5 deletions
diff --git a/Documentation/DocBook/kernel-api.tmpl b/Documentation/DocBook/kernel-api.tmpl
index eb42bf9847cb..ec7c498b69fc 100644
--- a/Documentation/DocBook/kernel-api.tmpl
+++ b/Documentation/DocBook/kernel-api.tmpl
@@ -704,14 +704,23 @@ X!Idrivers/video/console/fonts.c
704 704
705 <chapter id="splice"> 705 <chapter id="splice">
706 <title>splice API</title> 706 <title>splice API</title>
707 <para>) 707 <para>
708 splice is a method for moving blocks of data around inside the 708 splice is a method for moving blocks of data around inside the
709 kernel, without continually transferring it between the kernel 709 kernel, without continually transferring them between the kernel
710 and user space. 710 and user space.
711 </para> 711 </para>
712!Iinclude/linux/splice.h 712!Iinclude/linux/splice.h
713!Ffs/splice.c 713!Ffs/splice.c
714 </chapter> 714 </chapter>
715 715
716 <chapter id="pipes">
717 <title>pipes API</title>
718 <para>
719 Pipe interfaces are all for in-kernel (builtin image) use.
720 They are not exported for use by modules.
721 </para>
722!Iinclude/linux/pipe_fs_i.h
723!Ffs/pipe.c
724 </chapter>
716 725
717</book> 726</book>
diff --git a/fs/pipe.c b/fs/pipe.c
index d007830d9c87..6b3d91a691bf 100644
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -255,7 +255,7 @@ void generic_pipe_buf_get(struct pipe_inode_info *pipe, struct pipe_buffer *buf)
255 255
256/** 256/**
257 * generic_pipe_buf_confirm - verify contents of the pipe buffer 257 * generic_pipe_buf_confirm - verify contents of the pipe buffer
258 * @pipe: the pipe that the buffer belongs to 258 * @info: the pipe that the buffer belongs to
259 * @buf: the buffer to confirm 259 * @buf: the buffer to confirm
260 * 260 *
261 * Description: 261 * Description:
diff --git a/fs/splice.c b/fs/splice.c
index 0a0973218084..c010a72ca2d2 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -164,7 +164,7 @@ static const struct pipe_buf_operations user_page_pipe_buf_ops = {
164 * @spd: data to fill 164 * @spd: data to fill
165 * 165 *
166 * Description: 166 * Description:
167 * @spd contains a map of pages and len/offset tupples, a long with 167 * @spd contains a map of pages and len/offset tuples, along with
168 * the struct pipe_buf_operations associated with these pages. This 168 * the struct pipe_buf_operations associated with these pages. This
169 * function will link that data to the pipe. 169 * function will link that data to the pipe.
170 * 170 *
@@ -1000,7 +1000,7 @@ static long do_splice_to(struct file *in, loff_t *ppos,
1000 * Description: 1000 * Description:
1001 * This is a special case helper to splice directly between two 1001 * This is a special case helper to splice directly between two
1002 * points, without requiring an explicit pipe. Internally an allocated 1002 * points, without requiring an explicit pipe. Internally an allocated
1003 * pipe is cached in the process, and reused during the life time of 1003 * pipe is cached in the process, and reused during the lifetime of
1004 * that process. 1004 * that process.
1005 * 1005 *
1006 */ 1006 */