lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mm: remove return value of putback_lru_pages()

Browse Source 
putback_lru_page() never can fail.  So it doesn't matter count of "the
number of pages put back".

In addition, users of this functions don't use return value.

Let's remove unnecessary code.

Signed-off-by: Minchan Kim <minchan.kim@gmail.com>
Reviewed-by: Rik van Riel <riel@redhat.com>
Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Reviewed-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Minchan Kim
2010-05-24 14:31:59 -07:00
committed by Linus Torvalds
parent 4b50dc26a0
commit e13861d822
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/migrate.h
View File

@@ -9,7 +9,7 @@ typedef struct page *new_page_t(struct page *, unsigned long private, int **);
#ifdef CONFIG_MIGRATION #ifdef CONFIG_MIGRATION
#define PAGE_MIGRATION 1 #define PAGE_MIGRATION 1
extern int putback_lru_pages(struct list_head *l); extern void putback_lru_pages(struct list_head *l);
extern int migrate_page(struct address_space *, extern int migrate_page(struct address_space *,
struct page *, struct page *); struct page *, struct page *);
extern int migrate_pages(struct list_head *l, new_page_t x, extern int migrate_pages(struct list_head *l, new_page_t x,
@@ -25,7 +25,7 @@ extern int migrate_vmas(struct mm_struct *mm,
#else #else
#define PAGE_MIGRATION 0 #define PAGE_MIGRATION 0
static inline int putback_lru_pages(struct list_head *l) { return 0; } static inline void putback_lru_pages(struct list_head *l) {}
static inline int migrate_pages(struct list_head *l, new_page_t x, static inline int migrate_pages(struct list_head *l, new_page_t x,
unsigned long private, int offlining) { return -ENOSYS; } unsigned long private, int offlining) { return -ENOSYS; }

7
mm/migrate.c
View File

@@ -58,23 +58,18 @@ int migrate_prep(void)
/* /*
* Add isolated pages on the list back to the LRU under page lock * Add isolated pages on the list back to the LRU under page lock
* to avoid leaking evictable pages back onto unevictable list. * to avoid leaking evictable pages back onto unevictable list.
*
* returns the number of pages put back.
*/ */
int putback_lru_pages(struct list_head *l) void putback_lru_pages(struct list_head *l)
{ {
struct page *page; struct page *page;
struct page *page2; struct page *page2;
int count = 0;
list_for_each_entry_safe(page, page2, l, lru) { list_for_each_entry_safe(page, page2, l, lru) {
list_del(&page->lru); list_del(&page->lru);
dec_zone_page_state(page, NR_ISOLATED_ANON + dec_zone_page_state(page, NR_ISOLATED_ANON +
page_is_file_cache(page)); page_is_file_cache(page));
putback_lru_page(page); putback_lru_page(page);
count++;
} }
return count;
} }
/* /*