aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorRichard Yao <ryao@gentoo.org>2014-01-30 18:46:12 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2014-01-30 19:56:56 -0500
commit46bf16c44b90791445975463da671521fc430cae (patch)
treea4d458a134ca9f47efb1c696de757b398e3fb4f9 /Documentation
parent778c14affaf94a9e4953179d3e13a544ccce7707 (diff)
Documentation/filesystems/vfs.txt: update file_operations documentation
->readv, ->writev and ->sendfile have been removed while ->show_fdinfo has been added. The documentation should reflect this. Signed-off-by: Richard Yao <ryao@gentoo.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/filesystems/vfs.txt12
1 files changed, 2 insertions, 10 deletions
diff --git a/Documentation/filesystems/vfs.txt b/Documentation/filesystems/vfs.txt
index deb48b5fd883..c53784c119c8 100644
--- a/Documentation/filesystems/vfs.txt
+++ b/Documentation/filesystems/vfs.txt
@@ -782,7 +782,7 @@ struct file_operations
782---------------------- 782----------------------
783 783
784This describes how the VFS can manipulate an open file. As of kernel 784This describes how the VFS can manipulate an open file. As of kernel
7853.5, the following members are defined: 7853.12, the following members are defined:
786 786
787struct file_operations { 787struct file_operations {
788 struct module *owner; 788 struct module *owner;
@@ -803,9 +803,6 @@ struct file_operations {
803 int (*aio_fsync) (struct kiocb *, int datasync); 803 int (*aio_fsync) (struct kiocb *, int datasync);
804 int (*fasync) (int, struct file *, int); 804 int (*fasync) (int, struct file *, int);
805 int (*lock) (struct file *, int, struct file_lock *); 805 int (*lock) (struct file *, int, struct file_lock *);
806 ssize_t (*readv) (struct file *, const struct iovec *, unsigned long, loff_t *);
807 ssize_t (*writev) (struct file *, const struct iovec *, unsigned long, loff_t *);
808 ssize_t (*sendfile) (struct file *, loff_t *, size_t, read_actor_t, void *);
809 ssize_t (*sendpage) (struct file *, struct page *, int, size_t, loff_t *, int); 806 ssize_t (*sendpage) (struct file *, struct page *, int, size_t, loff_t *, int);
810 unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long); 807 unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
811 int (*check_flags)(int); 808 int (*check_flags)(int);
@@ -814,6 +811,7 @@ struct file_operations {
814 ssize_t (*splice_read)(struct file *, struct pipe_inode_info *, size_t, unsigned int); 811 ssize_t (*splice_read)(struct file *, struct pipe_inode_info *, size_t, unsigned int);
815 int (*setlease)(struct file *, long arg, struct file_lock **); 812 int (*setlease)(struct file *, long arg, struct file_lock **);
816 long (*fallocate)(struct file *, int mode, loff_t offset, loff_t len); 813 long (*fallocate)(struct file *, int mode, loff_t offset, loff_t len);
814 int (*show_fdinfo)(struct seq_file *m, struct file *f);
817}; 815};
818 816
819Again, all methods are called without any locks being held, unless 817Again, all methods are called without any locks being held, unless
@@ -864,12 +862,6 @@ otherwise noted.
864 lock: called by the fcntl(2) system call for F_GETLK, F_SETLK, and F_SETLKW 862 lock: called by the fcntl(2) system call for F_GETLK, F_SETLK, and F_SETLKW
865 commands 863 commands
866 864
867 readv: called by the readv(2) system call
868
869 writev: called by the writev(2) system call
870
871 sendfile: called by the sendfile(2) system call
872
873 get_unmapped_area: called by the mmap(2) system call 865 get_unmapped_area: called by the mmap(2) system call
874 866
875 check_flags: called by the fcntl(2) system call for F_SETFL command 867 check_flags: called by the fcntl(2) system call for F_SETFL command