diff options
Diffstat (limited to 'Documentation/filesystems')
-rw-r--r-- | Documentation/filesystems/Locking | 5 | ||||
-rw-r--r-- | Documentation/filesystems/vfs.txt | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking index 247d7f619aa2..eb1a6cad21e6 100644 --- a/Documentation/filesystems/Locking +++ b/Documentation/filesystems/Locking | |||
@@ -356,10 +356,9 @@ The last two are called only from check_disk_change(). | |||
356 | prototypes: | 356 | prototypes: |
357 | loff_t (*llseek) (struct file *, loff_t, int); | 357 | loff_t (*llseek) (struct file *, loff_t, int); |
358 | ssize_t (*read) (struct file *, char __user *, size_t, loff_t *); | 358 | ssize_t (*read) (struct file *, char __user *, size_t, loff_t *); |
359 | ssize_t (*aio_read) (struct kiocb *, char __user *, size_t, loff_t); | ||
360 | ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *); | 359 | ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *); |
361 | ssize_t (*aio_write) (struct kiocb *, const char __user *, size_t, | 360 | ssize_t (*aio_read) (struct kiocb *, const struct iovec *, unsigned long, loff_t); |
362 | loff_t); | 361 | ssize_t (*aio_write) (struct kiocb *, const struct iovec *, unsigned long, loff_t); |
363 | int (*readdir) (struct file *, void *, filldir_t); | 362 | int (*readdir) (struct file *, void *, filldir_t); |
364 | unsigned int (*poll) (struct file *, struct poll_table_struct *); | 363 | unsigned int (*poll) (struct file *, struct poll_table_struct *); |
365 | int (*ioctl) (struct inode *, struct file *, unsigned int, | 364 | int (*ioctl) (struct inode *, struct file *, unsigned int, |
diff --git a/Documentation/filesystems/vfs.txt b/Documentation/filesystems/vfs.txt index 1cb7e8be927a..cd07c21b8400 100644 --- a/Documentation/filesystems/vfs.txt +++ b/Documentation/filesystems/vfs.txt | |||
@@ -699,9 +699,9 @@ This describes how the VFS can manipulate an open file. As of kernel | |||
699 | struct file_operations { | 699 | struct file_operations { |
700 | loff_t (*llseek) (struct file *, loff_t, int); | 700 | loff_t (*llseek) (struct file *, loff_t, int); |
701 | ssize_t (*read) (struct file *, char __user *, size_t, loff_t *); | 701 | ssize_t (*read) (struct file *, char __user *, size_t, loff_t *); |
702 | ssize_t (*aio_read) (struct kiocb *, char __user *, size_t, loff_t); | ||
703 | ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *); | 702 | ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *); |
704 | ssize_t (*aio_write) (struct kiocb *, const char __user *, size_t, loff_t); | 703 | ssize_t (*aio_read) (struct kiocb *, const struct iovec *, unsigned long, loff_t); |
704 | ssize_t (*aio_write) (struct kiocb *, const struct iovec *, unsigned long, loff_t); | ||
705 | int (*readdir) (struct file *, void *, filldir_t); | 705 | int (*readdir) (struct file *, void *, filldir_t); |
706 | unsigned int (*poll) (struct file *, struct poll_table_struct *); | 706 | unsigned int (*poll) (struct file *, struct poll_table_struct *); |
707 | int (*ioctl) (struct inode *, struct file *, unsigned int, unsigned long); | 707 | int (*ioctl) (struct inode *, struct file *, unsigned int, unsigned long); |