diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-22 23:03:49 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-22 23:03:49 +0400 |
| commit | a8472b4bb1aaa421b10f2cc40f70097e67f971ae (patch) | |
| tree | 3f345e0c1c4f9986ba1c8f3cd541f47fbe30b985 /include | |
| parent | 3dc9acb67600393249a795934ccdfc291a200e6b (diff) | |
| parent | 8e321fefb0e60bae4e2a28d20fc4fa30758d27c6 (diff) | |
| download | linux-a8472b4bb1aaa421b10f2cc40f70097e67f971ae.tar.xz | |
Merge git://git.kvack.org/~bcrl/aio-next
Pull AIO leak fixes from Ben LaHaise:
"I've put these two patches plus Linus's change through a round of
tests, and it passes millions of iterations of the aio numa
migratepage test, as well as a number of repetitions of a few simple
read and write tests.
The first patch fixes the memory leak Kent introduced, while the
second patch makes aio_migratepage() much more paranoid and robust"
* git://git.kvack.org/~bcrl/aio-next:
aio/migratepages: make aio migrate pages sane
aio: fix kioctx leak introduced by "aio: Fix a trinity splat"
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/migrate.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/migrate.h b/include/linux/migrate.h index b7717d74da7f..f015c059e159 100644 --- a/include/linux/migrate.h +++ b/include/linux/migrate.h @@ -55,7 +55,8 @@ extern int migrate_huge_page_move_mapping(struct address_space *mapping, struct page *newpage, struct page *page); extern int migrate_page_move_mapping(struct address_space *mapping, struct page *newpage, struct page *page, - struct buffer_head *head, enum migrate_mode mode); + struct buffer_head *head, enum migrate_mode mode, + int extra_count); #else static inline void putback_lru_pages(struct list_head *l) {} |