From fa086303eda57966162b4944e82ea5c358cf01be Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Fri, 8 Feb 2008 04:21:24 -0800 Subject: [PATCH] --- yaml --- r: 84779 b: refs/heads/master c: 36e789144267105e0b3f2b9bca7db3184fce50dc h: refs/heads/master i: 84777: 4035b106114dfa686b6f6a63614286aaaecec5ab 84775: c99aabc7971b8a7dc314809fea76ab6df3024e15 v: v3 --- [refs] | 2 +- trunk/include/linux/fs.h | 15 --------------- trunk/mm/filemap.c | 18 +++++------------- 3 files changed, 6 insertions(+), 29 deletions(-) diff --git a/[refs] b/[refs] index 03cec1701b6e..723840b30376 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7437a51b30743ff1488981a393fc9e67894bf757 +refs/heads/master: 36e789144267105e0b3f2b9bca7db3184fce50dc diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h index 1137a8828089..3db22fc2249a 100644 --- a/trunk/include/linux/fs.h +++ b/trunk/include/linux/fs.h @@ -1807,9 +1807,6 @@ extern ssize_t generic_file_buffered_write(struct kiocb *, const struct iovec *, unsigned long, loff_t, loff_t *, size_t, ssize_t); extern ssize_t do_sync_read(struct file *filp, char __user *buf, size_t len, loff_t *ppos); extern ssize_t do_sync_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos); -extern void do_generic_mapping_read(struct address_space *mapping, - struct file_ra_state *, struct file *, - loff_t *, read_descriptor_t *, read_actor_t); extern int generic_segment_checks(const struct iovec *iov, unsigned long *nr_segs, size_t *count, int access_flags); @@ -1847,18 +1844,6 @@ static inline int xip_truncate_page(struct address_space *mapping, loff_t from) } #endif -static inline void do_generic_file_read(struct file * filp, loff_t *ppos, - read_descriptor_t * desc, - read_actor_t actor) -{ - do_generic_mapping_read(filp->f_mapping, - &filp->f_ra, - filp, - ppos, - desc, - actor); -} - #ifdef CONFIG_BLOCK ssize_t __blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode, struct block_device *bdev, const struct iovec *iov, loff_t offset, diff --git a/trunk/mm/filemap.c b/trunk/mm/filemap.c index 4eb958c402fe..b7b1be6dbd83 100644 --- a/trunk/mm/filemap.c +++ b/trunk/mm/filemap.c @@ -875,9 +875,7 @@ static void shrink_readahead_size_eio(struct file *filp, } /** - * do_generic_mapping_read - generic file read routine - * @mapping: address_space to be read - * @ra: file's readahead state + * do_generic_file_read - generic file read routine * @filp: the file to read * @ppos: current file position * @desc: read_descriptor @@ -888,18 +886,13 @@ static void shrink_readahead_size_eio(struct file *filp, * * This is really ugly. But the goto's actually try to clarify some * of the logic when it comes to error handling etc. - * - * Note the struct file* is only passed for the use of readpage. - * It may be NULL. */ -void do_generic_mapping_read(struct address_space *mapping, - struct file_ra_state *ra, - struct file *filp, - loff_t *ppos, - read_descriptor_t *desc, - read_actor_t actor) +static void do_generic_file_read(struct file *filp, loff_t *ppos, + read_descriptor_t *desc, read_actor_t actor) { + struct address_space *mapping = filp->f_mapping; struct inode *inode = mapping->host; + struct file_ra_state *ra = &filp->f_ra; pgoff_t index; pgoff_t last_index; pgoff_t prev_index; @@ -1091,7 +1084,6 @@ void do_generic_mapping_read(struct address_space *mapping, if (filp) file_accessed(filp); } -EXPORT_SYMBOL(do_generic_mapping_read); int file_read_actor(read_descriptor_t *desc, struct page *page, unsigned long offset, unsigned long size)