提交 2678958e 编写于 作者: J Johannes Weiner 提交者: Linus Torvalds

ramfs-nommu: use generic lru cache

Instead of open-coding the lru-list-add pagevec batching when expanding a
file mapping from zero, defer to the appropriate page cache function that
also takes care of adding the page to the lru list.

This is cleaner, saves code and reduces the stack footprint by 16 words
worth of pagevec.
Signed-off-by: NJohannes Weiner <hannes@cmpxchg.org>
Acked-by: NDavid Howells <dhowells@redhat.com>
Cc: Nick Piggin <npiggin@suse.de>
Acked-by: NKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.com>
Cc: MinChan Kim <minchan.kim@gmail.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
Cc: Greg Ungerer <gerg@snapgear.com>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 88c3bd70
...@@ -59,7 +59,6 @@ const struct inode_operations ramfs_file_inode_operations = { ...@@ -59,7 +59,6 @@ const struct inode_operations ramfs_file_inode_operations = {
*/ */
int ramfs_nommu_expand_for_mapping(struct inode *inode, size_t newsize) int ramfs_nommu_expand_for_mapping(struct inode *inode, size_t newsize)
{ {
struct pagevec lru_pvec;
unsigned long npages, xpages, loop, limit; unsigned long npages, xpages, loop, limit;
struct page *pages; struct page *pages;
unsigned order; unsigned order;
...@@ -102,24 +101,20 @@ int ramfs_nommu_expand_for_mapping(struct inode *inode, size_t newsize) ...@@ -102,24 +101,20 @@ int ramfs_nommu_expand_for_mapping(struct inode *inode, size_t newsize)
memset(data, 0, newsize); memset(data, 0, newsize);
/* attach all the pages to the inode's address space */ /* attach all the pages to the inode's address space */
pagevec_init(&lru_pvec, 0);
for (loop = 0; loop < npages; loop++) { for (loop = 0; loop < npages; loop++) {
struct page *page = pages + loop; struct page *page = pages + loop;
ret = add_to_page_cache(page, inode->i_mapping, loop, GFP_KERNEL); ret = add_to_page_cache_lru(page, inode->i_mapping, loop,
GFP_KERNEL);
if (ret < 0) if (ret < 0)
goto add_error; goto add_error;
if (!pagevec_add(&lru_pvec, page))
__pagevec_lru_add_file(&lru_pvec);
/* prevent the page from being discarded on memory pressure */ /* prevent the page from being discarded on memory pressure */
SetPageDirty(page); SetPageDirty(page);
unlock_page(page); unlock_page(page);
} }
pagevec_lru_add_file(&lru_pvec);
return 0; return 0;
fsize_exceeded: fsize_exceeded:
...@@ -128,10 +123,8 @@ int ramfs_nommu_expand_for_mapping(struct inode *inode, size_t newsize) ...@@ -128,10 +123,8 @@ int ramfs_nommu_expand_for_mapping(struct inode *inode, size_t newsize)
return -EFBIG; return -EFBIG;
add_error: add_error:
pagevec_lru_add_file(&lru_pvec); while (loop < npages)
page_cache_release(pages + loop); __free_page(pages + loop++);
for (loop++; loop < npages; loop++)
__free_page(pages + loop);
return ret; return ret;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册