diff options
author | Christoph Hellwig <hch@lst.de> | 2008-02-08 07:21:24 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-08 12:22:39 -0500 |
commit | 36e789144267105e0b3f2b9bca7db3184fce50dc (patch) | |
tree | cff6b92b2d54cf5e88db3f0fd71071a6b80b06f5 /include | |
parent | 7437a51b30743ff1488981a393fc9e67894bf757 (diff) |
kill do_generic_mapping_read
do_generic_mapping_read was used by gfs2 for internals reads, but this use
of the interface was rather suboptimal (as was the whole interface) and has
been replaced by an internal helper now. This patch kills
do_generic_mapping_read and surrounding damage in preparation of additional
cleanups for the buffered read path.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/fs.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 1137a8828089..3db22fc2249a 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
@@ -1807,9 +1807,6 @@ extern ssize_t generic_file_buffered_write(struct kiocb *, const struct iovec *, | |||
1807 | unsigned long, loff_t, loff_t *, size_t, ssize_t); | 1807 | unsigned long, loff_t, loff_t *, size_t, ssize_t); |
1808 | extern ssize_t do_sync_read(struct file *filp, char __user *buf, size_t len, loff_t *ppos); | 1808 | extern ssize_t do_sync_read(struct file *filp, char __user *buf, size_t len, loff_t *ppos); |
1809 | extern ssize_t do_sync_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos); | 1809 | extern ssize_t do_sync_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos); |
1810 | extern void do_generic_mapping_read(struct address_space *mapping, | ||
1811 | struct file_ra_state *, struct file *, | ||
1812 | loff_t *, read_descriptor_t *, read_actor_t); | ||
1813 | extern int generic_segment_checks(const struct iovec *iov, | 1810 | extern int generic_segment_checks(const struct iovec *iov, |
1814 | unsigned long *nr_segs, size_t *count, int access_flags); | 1811 | unsigned long *nr_segs, size_t *count, int access_flags); |
1815 | 1812 | ||
@@ -1847,18 +1844,6 @@ static inline int xip_truncate_page(struct address_space *mapping, loff_t from) | |||
1847 | } | 1844 | } |
1848 | #endif | 1845 | #endif |
1849 | 1846 | ||
1850 | static inline void do_generic_file_read(struct file * filp, loff_t *ppos, | ||
1851 | read_descriptor_t * desc, | ||
1852 | read_actor_t actor) | ||
1853 | { | ||
1854 | do_generic_mapping_read(filp->f_mapping, | ||
1855 | &filp->f_ra, | ||
1856 | filp, | ||
1857 | ppos, | ||
1858 | desc, | ||
1859 | actor); | ||
1860 | } | ||
1861 | |||
1862 | #ifdef CONFIG_BLOCK | 1847 | #ifdef CONFIG_BLOCK |
1863 | ssize_t __blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode, | 1848 | ssize_t __blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode, |
1864 | struct block_device *bdev, const struct iovec *iov, loff_t offset, | 1849 | struct block_device *bdev, const struct iovec *iov, loff_t offset, |