]> git.ipfire.org Git - ipfire-2.x.git/blame - src/patches/linux-2.6-vmscan_remove_wait_on_page_writeback.patch
snort: Update urls for rules download (2.9.7.0) in 'ids.cgi'
[ipfire-2.x.git] / src / patches / linux-2.6-vmscan_remove_wait_on_page_writeback.patch
CommitLineData
9d4e6322
AF
1--- linux-next.orig/mm/vmscan.c 2010-07-28 16:22:21.000000000 +0800
2+++ linux-next/mm/vmscan.c 2010-07-28 16:23:35.000000000 +0800
3@@ -324,8 +324,7 @@ typedef enum {
4 * pageout is called by shrink_page_list() for each dirty page.
5 * Calls ->writepage().
6 */
7-static pageout_t pageout(struct page *page, struct address_space *mapping,
8- enum pageout_io sync_writeback)
9+static pageout_t pageout(struct page *page, struct address_space *mapping)
10 {
11 /*
12 * If the page is dirty, only perform writeback if that write
13@@ -384,14 +383,6 @@ static pageout_t pageout(struct page *pa
14 return PAGE_ACTIVATE;
15 }
16
17- /*
18- * Wait on writeback if requested to. This happens when
19- * direct reclaiming a large contiguous area and the
20- * first attempt to free a range of pages fails.
21- */
22- if (PageWriteback(page) && sync_writeback == PAGEOUT_IO_SYNC)
23- wait_on_page_writeback(page);
24-
25 if (!PageWriteback(page)) {
26 /* synchronous write or broken a_ops? */
27 ClearPageReclaim(page);
28@@ -727,7 +718,7 @@ static unsigned long shrink_page_list(st
29 goto keep_locked;
30
31 /* Page is dirty, try to write it out here */
32- switch (pageout(page, mapping, sync_writeback)) {
33+ switch (pageout(page, mapping)) {
34 case PAGE_KEEP:
35 goto keep_locked;
36 case PAGE_ACTIVATE:
37