summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-28 19:31:13 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-28 19:31:13 -0700
commit8e8ef2971b0fd6dcf1a66014fb74b41938eecb4e (patch)
tree3c451f9c21123046806724680a3a8aebd48e6247 /fs
parent933a6208d84c92d92f9264a2e28d0fc317d41fd1 (diff)
parent79685b8deea4541d18882d8c07d0e99e788292ab (diff)
downloadop-kernel-dev-8e8ef2971b0fd6dcf1a66014fb74b41938eecb4e.zip
op-kernel-dev-8e8ef2971b0fd6dcf1a66014fb74b41938eecb4e.tar.gz
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block: docbook: add pipes, other fixes blktrace: use cpu_clock() instead of sched_clock() bsg: Fix build for CONFIG_BLOCK=n [patch] QUEUE_FLAG_READFULL QUEUE_FLAG_WRITEFULL comment fix
Diffstat (limited to 'fs')
-rw-r--r--fs/pipe.c2
-rw-r--r--fs/splice.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/pipe.c b/fs/pipe.c
index d007830..6b3d91a 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)
/**
* generic_pipe_buf_confirm - verify contents of the pipe buffer
- * @pipe: the pipe that the buffer belongs to
+ * @info: the pipe that the buffer belongs to
* @buf: the buffer to confirm
*
* Description:
diff --git a/fs/splice.c b/fs/splice.c
index 0a09732..c010a72 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -164,7 +164,7 @@ static const struct pipe_buf_operations user_page_pipe_buf_ops = {
* @spd: data to fill
*
* Description:
- * @spd contains a map of pages and len/offset tupples, a long with
+ * @spd contains a map of pages and len/offset tuples, along with
* the struct pipe_buf_operations associated with these pages. This
* function will link that data to the pipe.
*
@@ -1000,7 +1000,7 @@ static long do_splice_to(struct file *in, loff_t *ppos,
* Description:
* This is a special case helper to splice directly between two
* points, without requiring an explicit pipe. Internally an allocated
- * pipe is cached in the process, and reused during the life time of
+ * pipe is cached in the process, and reused during the lifetime of
* that process.
*
*/
OpenPOWER on IntegriCloud