Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 268fc16e authored by OGAWA Hirofumi's avatar OGAWA Hirofumi Committed by Linus Torvalds
Browse files

[PATCH] export/change sync_page_range/_nolock() 



This exports/changes the sync_page_range/_nolock().  The fatfs needs
sync_page_range/_nolock() for expanding truncate, and changes "size_t count"
to "loff_t count".

Signed-off-by: default avatarOGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e5174baa

include/linux/writeback.h

+3 −1
Original line number Diff line number Diff line
@@ -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

mm/filemap.c

+4 −4
Original line number Diff line number Diff line
@@ -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