summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPekka J Enberg <penberg@cs.Helsinki.FI>2006-04-11 14:21:59 +0200
committerJens Axboe <axboe@suse.de>2006-04-11 14:21:59 +0200
commitd1195c516a9acd767cb541f914be2c6ddcafcfc1 (patch)
tree1edb7afcdee207e34298ec72e0a89b0a66866b2b
parent7519fdc90fe577cb966ab1ce2bf51ac639f05a0e (diff)
downloadlinux-d1195c516a9acd767cb541f914be2c6ddcafcfc1.tar.gz
linux-d1195c516a9acd767cb541f914be2c6ddcafcfc1.tar.bz2
linux-d1195c516a9acd767cb541f914be2c6ddcafcfc1.zip
[PATCH] vfs: add splice_write and splice_read to documentation
This patch adds the new splice_write and splice_read file operations to Documentation/filesystems/vfs.txt. Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi> Signed-off-by: Jens Axboe <axboe@suse.de>
-rw-r--r--Documentation/filesystems/vfs.txt12
1 files changed, 11 insertions, 1 deletions
diff --git a/Documentation/filesystems/vfs.txt b/Documentation/filesystems/vfs.txt
index adaa899e5c90..3a2e5520c1e3 100644
--- a/Documentation/filesystems/vfs.txt
+++ b/Documentation/filesystems/vfs.txt
@@ -694,7 +694,7 @@ struct file_operations
----------------------
This describes how the VFS can manipulate an open file. As of kernel
-2.6.13, the following members are defined:
+2.6.17, the following members are defined:
struct file_operations {
loff_t (*llseek) (struct file *, loff_t, int);
@@ -723,6 +723,10 @@ struct file_operations {
int (*check_flags)(int);
int (*dir_notify)(struct file *filp, unsigned long arg);
int (*flock) (struct file *, int, struct file_lock *);
+ ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, size_t, unsigned
+int);
+ ssize_t (*splice_read)(struct file *, struct pipe_inode_info *, size_t, unsigned
+int);
};
Again, all methods are called without any locks being held, unless
@@ -790,6 +794,12 @@ otherwise noted.
flock: called by the flock(2) system call
+ splice_write: called by the VFS to splice data from a pipe to a file. This
+ method is used by the splice(2) system call
+
+ splice_read: called by the VFS to splice data from file to a pipe. This
+ method is used by the splice(2) system call
+
Note that the file operations are implemented by the specific
filesystem in which the inode resides. When opening a device node
(character or block special) most filesystems will call special