From: Fengguang Wu <wfg@mail.ustc.edu.cn>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@osdl.org>, linux-kernel@vger.kernel.org
Subject: [PATCH 4/8] trivial filemap.c cleanups
Date: Sat, 21 Jul 2007 11:57:37 +0800 [thread overview]
Message-ID: <384990324.78365@ustc.edu.cn> (raw)
Message-ID: <20070721035851.461364420@mail.ustc.edu.cn> (raw)
In-Reply-To: 20070721035733.951838089@mail.ustc.edu.cn
[-- Attachment #1: cleanup-filemap.patch --]
[-- Type: text/plain, Size: 2144 bytes --]
- remove unused local next_index in do_generic_mapping_read()
- convert some 'unsigned long' to pgoff_t
- wrap a long line
Signed-off-by: Fengguang Wu <wfg@mail.ustc.edu.cn>
---
mm/filemap.c | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
--- linux-2.6.22-git15.orig/mm/filemap.c
+++ linux-2.6.22-git15/mm/filemap.c
@@ -866,11 +866,10 @@ void do_generic_mapping_read(struct addr
read_actor_t actor)
{
struct inode *inode = mapping->host;
- unsigned long index;
- unsigned long offset;
- unsigned long last_index;
- unsigned long next_index;
- unsigned long prev_index;
+ pgoff_t index;
+ pgoff_t offset;
+ pgoff_t last_index;
+ pgoff_t prev_index;
unsigned int prev_offset;
struct page *cached_page;
int error;
@@ -878,7 +877,6 @@ void do_generic_mapping_read(struct addr
cached_page = NULL;
index = *ppos >> PAGE_CACHE_SHIFT;
- next_index = index;
prev_index = ra.prev_pos >> PAGE_CACHE_SHIFT;
prev_offset = ra.prev_pos & (PAGE_CACHE_SIZE-1);
last_index = (*ppos + desc->count + PAGE_CACHE_SIZE-1) >> PAGE_CACHE_SHIFT;
@@ -1219,7 +1217,8 @@ out:
}
EXPORT_SYMBOL(generic_file_aio_read);
-int file_send_actor(read_descriptor_t * desc, struct page *page, unsigned long offset, unsigned long size)
+int file_send_actor(read_descriptor_t * desc, struct page *page,
+ unsigned long offset, unsigned long size)
{
ssize_t written;
unsigned long count = desc->count;
@@ -1272,7 +1271,6 @@ asmlinkage ssize_t sys_readahead(int fd,
}
#ifdef CONFIG_MMU
-static int FASTCALL(page_cache_read(struct file * file, unsigned long offset));
/**
* page_cache_read - adds requested page to the page cache if not already there
* @file: file to read
@@ -1281,7 +1279,7 @@ static int FASTCALL(page_cache_read(stru
* This adds the requested page to the page cache if it isn't already there,
* and schedules an I/O to read in its contents from disk.
*/
-static int fastcall page_cache_read(struct file * file, unsigned long offset)
+static int fastcall page_cache_read(struct file * file, pgoff_t offset)
{
struct address_space *mapping = file->f_mapping;
struct page *page;
--
next prev parent reply other threads:[~2007-07-21 4:02 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20070721035733.951838089@mail.ustc.edu.cn>
2007-07-21 3:57 ` [PATCH 0/8] readahead cleanups and interleaved readahead take 2 Fengguang Wu
[not found] ` <20070721035850.977231489@mail.ustc.edu.cn>
2007-07-21 3:57 ` [PATCH 1/8] compacting file_ra_state Fengguang Wu
[not found] ` <20070721040644.GA9750@mail.ustc.edu.cn>
2007-07-21 4:06 ` Fengguang Wu
2007-07-21 4:27 ` Linus Torvalds
[not found] ` <20070721042939.GA28875@mail.ustc.edu.cn>
2007-07-21 4:29 ` Fengguang Wu
2007-07-21 5:57 ` Andi Kleen
2007-07-21 6:03 ` Andrew Morton
2007-07-21 6:13 ` Linus Torvalds
2007-07-21 6:17 ` Andi Kleen
[not found] ` <20070721035851.185553787@mail.ustc.edu.cn>
2007-07-21 3:57 ` [PATCH 2/8] mmap read-around simplification Fengguang Wu
[not found] ` <20070721035851.321030363@mail.ustc.edu.cn>
2007-07-21 3:57 ` [PATCH 3/8] combine file_ra_state.prev_index/prev_offset into prev_pos Fengguang Wu
[not found] ` <20070721035851.461364420@mail.ustc.edu.cn>
2007-07-21 3:57 ` Fengguang Wu [this message]
[not found] ` <20070721035851.638623804@mail.ustc.edu.cn>
2007-07-21 3:57 ` [PATCH 5/8] remove several readahead macros Fengguang Wu
[not found] ` <20070721035851.791763729@mail.ustc.edu.cn>
2007-07-21 3:57 ` [PATCH 6/8] remove the limit max_sectors_kb imposed on max_readahead_kb Fengguang Wu
[not found] ` <20070721035851.946351617@mail.ustc.edu.cn>
2007-07-21 3:57 ` [PATCH 7/8] introduce radix_tree_scan_hole() Fengguang Wu
[not found] ` <20070721035852.104255316@mail.ustc.edu.cn>
2007-07-21 3:57 ` [PATCH 8/8] basic support of interleaved reads Fengguang Wu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=384990324.78365@ustc.edu.cn \
--to=wfg@mail.ustc.edu.cn \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox