From 94240990d8ea7fb4d36366f5e3f2a2bd3ca8abcf Mon Sep 17 00:00:00 2001 From: OGAWA Hirofumi Date: Sun, 8 Jan 2006 01:02:12 -0800 Subject: [PATCH] --- yaml --- r: 16923 b: refs/heads/master c: 268fc16e343b4f8e249468747db2e658da46a814 h: refs/heads/master i: 16921: a4f38cd189cffe69b993852903a407536193fb5c 16919: f6b42b5b0802b3d7dcc5ab231c5743183a4b0ccf v: v3 --- [refs] | 2 +- trunk/include/linux/writeback.h | 4 +++- trunk/mm/filemap.c | 8 ++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index dddd2e5731b2..03b6be0a245c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e5174baaea7585760f02eef23b225847d209a8db +refs/heads/master: 268fc16e343b4f8e249468747db2e658da46a814 diff --git a/trunk/include/linux/writeback.h b/trunk/include/linux/writeback.h index b096159086e8..beaef5c7a0ea 100644 --- a/trunk/include/linux/writeback.h +++ b/trunk/include/linux/writeback.h @@ -103,7 +103,9 @@ void balance_dirty_pages_ratelimited(struct address_space *mapping); int pdflush_operation(void (*fn)(unsigned long), unsigned long arg0); int do_writepages(struct address_space *mapping, struct writeback_control *wbc); int sync_page_range(struct inode *inode, struct address_space *mapping, - loff_t pos, size_t count); + loff_t pos, loff_t count); +int sync_page_range_nolock(struct inode *inode, struct address_space *mapping, + loff_t pos, loff_t count); /* pdflush.c */ extern int nr_pdflush_threads; /* Global so it can be exported to sysctl diff --git a/trunk/mm/filemap.c b/trunk/mm/filemap.c index 4ef24a397684..8fdf36508023 100644 --- a/trunk/mm/filemap.c +++ b/trunk/mm/filemap.c @@ -280,7 +280,7 @@ static int wait_on_page_writeback_range(struct address_space *mapping, * it is otherwise livelockable. */ int sync_page_range(struct inode *inode, struct address_space *mapping, - loff_t pos, size_t count) + loff_t pos, loff_t count) { pgoff_t start = pos >> PAGE_CACHE_SHIFT; pgoff_t end = (pos + count - 1) >> PAGE_CACHE_SHIFT; @@ -305,9 +305,8 @@ EXPORT_SYMBOL(sync_page_range); * as it forces O_SYNC writers to different parts of the same file * to be serialised right until io completion. */ -static int sync_page_range_nolock(struct inode *inode, - struct address_space *mapping, - loff_t pos, size_t count) +int sync_page_range_nolock(struct inode *inode, struct address_space *mapping, + loff_t pos, loff_t count) { pgoff_t start = pos >> PAGE_CACHE_SHIFT; pgoff_t end = (pos + count - 1) >> PAGE_CACHE_SHIFT; @@ -322,6 +321,7 @@ static int sync_page_range_nolock(struct inode *inode, ret = wait_on_page_writeback_range(mapping, start, end); return ret; } +EXPORT_SYMBOL(sync_page_range_nolock); /** * filemap_fdatawait - walk the list of under-writeback pages of the given