Skip to content

Commit

Permalink
mm: remove return value of putback_lru_pages()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Minchan Kim authored and Linus Torvalds committed May 25, 2010
1 parent 4b50dc2 commit e13861d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 8 deletions.
4 changes: 2 additions & 2 deletions include/linux/migrate.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ typedef struct page *new_page_t(struct page *, unsigned long private, int **);
#ifdef CONFIG_MIGRATION
#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 *,
struct page *, struct page *);
extern int migrate_pages(struct list_head *l, new_page_t x,
Expand All @@ -25,7 +25,7 @@ extern int migrate_vmas(struct mm_struct *mm,
#else
#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,
unsigned long private, int offlining) { return -ENOSYS; }

Expand Down
7 changes: 1 addition & 6 deletions mm/migrate.c
Original file line number Diff line number Diff line change
Expand Up @@ -58,23 +58,18 @@ int migrate_prep(void)
/*
* Add isolated pages on the list back to the LRU under page lock
* 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 *page2;
int count = 0;

list_for_each_entry_safe(page, page2, l, lru) {
list_del(&page->lru);
dec_zone_page_state(page, NR_ISOLATED_ANON +
page_is_file_cache(page));
putback_lru_page(page);
count++;
}
return count;
}

/*
Expand Down

0 comments on commit e13861d

Please sign in to comment.