diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2015-04-04 01:14:53 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-04-11 22:29:43 -0400 |
| commit | 8436318205b9f29e45db88850ec60e326327e241 (patch) | |
| tree | 4339c116819e9e6d8e61a1876d9d0d08d0ee089c /Documentation | |
| parent | 1c65d98672e09a0cb28e1e9ae49e9d96355f522f (diff) | |
->aio_read and ->aio_write removed
no remaining users
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/filesystems/Locking | 2 | ||||
| -rw-r--r-- | Documentation/filesystems/porting | 3 | ||||
| -rw-r--r-- | Documentation/filesystems/vfs.txt | 6 |
3 files changed, 3 insertions, 8 deletions
diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking index f91926f2f482..c3cd6279e92e 100644 --- a/Documentation/filesystems/Locking +++ b/Documentation/filesystems/Locking | |||
| @@ -429,8 +429,6 @@ prototypes: | |||
| 429 | loff_t (*llseek) (struct file *, loff_t, int); | 429 | loff_t (*llseek) (struct file *, loff_t, int); |
| 430 | ssize_t (*read) (struct file *, char __user *, size_t, loff_t *); | 430 | ssize_t (*read) (struct file *, char __user *, size_t, loff_t *); |
| 431 | ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *); | 431 | ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *); |
| 432 | ssize_t (*aio_read) (struct kiocb *, const struct iovec *, unsigned long, loff_t); | ||
| 433 | ssize_t (*aio_write) (struct kiocb *, const struct iovec *, unsigned long, loff_t); | ||
| 434 | ssize_t (*read_iter) (struct kiocb *, struct iov_iter *); | 432 | ssize_t (*read_iter) (struct kiocb *, struct iov_iter *); |
| 435 | ssize_t (*write_iter) (struct kiocb *, struct iov_iter *); | 433 | ssize_t (*write_iter) (struct kiocb *, struct iov_iter *); |
| 436 | int (*iterate) (struct file *, struct dir_context *); | 434 | int (*iterate) (struct file *, struct dir_context *); |
diff --git a/Documentation/filesystems/porting b/Documentation/filesystems/porting index 4006483c275f..e69274de8d0c 100644 --- a/Documentation/filesystems/porting +++ b/Documentation/filesystems/porting | |||
| @@ -480,3 +480,6 @@ in your dentry operations instead. | |||
| 480 | [mandatory] | 480 | [mandatory] |
| 481 | do _not_ use new_sync_{read,write} for ->read/->write; leave it NULL | 481 | do _not_ use new_sync_{read,write} for ->read/->write; leave it NULL |
| 482 | instead. | 482 | instead. |
| 483 | -- | ||
| 484 | [mandatory] | ||
| 485 | ->aio_read/->aio_write are gone. Use ->read_iter/->write_iter. | ||
diff --git a/Documentation/filesystems/vfs.txt b/Documentation/filesystems/vfs.txt index 966b22829f3b..207cdca68bed 100644 --- a/Documentation/filesystems/vfs.txt +++ b/Documentation/filesystems/vfs.txt | |||
| @@ -804,8 +804,6 @@ struct file_operations { | |||
| 804 | loff_t (*llseek) (struct file *, loff_t, int); | 804 | loff_t (*llseek) (struct file *, loff_t, int); |
| 805 | ssize_t (*read) (struct file *, char __user *, size_t, loff_t *); | 805 | ssize_t (*read) (struct file *, char __user *, size_t, loff_t *); |
| 806 | ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *); | 806 | ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *); |
| 807 | ssize_t (*aio_read) (struct kiocb *, const struct iovec *, unsigned long, loff_t); | ||
| 808 | ssize_t (*aio_write) (struct kiocb *, const struct iovec *, unsigned long, loff_t); | ||
| 809 | ssize_t (*read_iter) (struct kiocb *, struct iov_iter *); | 807 | ssize_t (*read_iter) (struct kiocb *, struct iov_iter *); |
| 810 | ssize_t (*write_iter) (struct kiocb *, struct iov_iter *); | 808 | ssize_t (*write_iter) (struct kiocb *, struct iov_iter *); |
| 811 | int (*iterate) (struct file *, struct dir_context *); | 809 | int (*iterate) (struct file *, struct dir_context *); |
| @@ -838,14 +836,10 @@ otherwise noted. | |||
| 838 | 836 | ||
| 839 | read: called by read(2) and related system calls | 837 | read: called by read(2) and related system calls |
| 840 | 838 | ||
| 841 | aio_read: vectored, possibly asynchronous read | ||
| 842 | |||
| 843 | read_iter: possibly asynchronous read with iov_iter as destination | 839 | read_iter: possibly asynchronous read with iov_iter as destination |
| 844 | 840 | ||
| 845 | write: called by write(2) and related system calls | 841 | write: called by write(2) and related system calls |
| 846 | 842 | ||
| 847 | aio_write: vectored, possibly asynchronous write | ||
| 848 | |||
| 849 | write_iter: possibly asynchronous write with iov_iter as source | 843 | write_iter: possibly asynchronous write with iov_iter as source |
| 850 | 844 | ||
| 851 | iterate: called when the VFS needs to read the directory contents | 845 | iterate: called when the VFS needs to read the directory contents |