From: Greg Kroah-Hartman Date: Tue, 7 Jan 2014 18:55:10 +0000 (-0800) Subject: 3.12 fuzz cleanup X-Git-Tag: v3.4.76~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c78a07edba980f17340120f9273dfeadcd9017c7;p=thirdparty%2Fkernel%2Fstable-queue.git 3.12 fuzz cleanup --- diff --git a/queue-3.12/aio-migratepages-make-aio-migrate-pages-sane.patch b/queue-3.12/aio-migratepages-make-aio-migrate-pages-sane.patch index 62b0ae33746..89dbb74d68a 100644 --- a/queue-3.12/aio-migratepages-make-aio-migrate-pages-sane.patch +++ b/queue-3.12/aio-migratepages-make-aio-migrate-pages-sane.patch @@ -130,7 +130,7 @@ Signed-off-by: Greg Kroah-Hartman static inline void putback_lru_pages(struct list_head *l) {} --- a/mm/migrate.c +++ b/mm/migrate.c -@@ -315,14 +315,15 @@ static inline bool buffer_migrate_lock_b +@@ -316,14 +316,15 @@ static inline bool buffer_migrate_lock_b */ int migrate_page_move_mapping(struct address_space *mapping, struct page *newpage, struct page *page, @@ -149,7 +149,7 @@ Signed-off-by: Greg Kroah-Hartman return -EAGAIN; return MIGRATEPAGE_SUCCESS; } -@@ -332,7 +333,7 @@ int migrate_page_move_mapping(struct add +@@ -333,7 +334,7 @@ int migrate_page_move_mapping(struct add pslot = radix_tree_lookup_slot(&mapping->page_tree, page_index(page)); @@ -158,7 +158,7 @@ Signed-off-by: Greg Kroah-Hartman if (page_count(page) != expected_count || radix_tree_deref_slot_protected(pslot, &mapping->tree_lock) != page) { spin_unlock_irq(&mapping->tree_lock); -@@ -525,7 +526,7 @@ int migrate_page(struct address_space *m +@@ -526,7 +527,7 @@ int migrate_page(struct address_space *m BUG_ON(PageWriteback(page)); /* Writeback must be complete */ @@ -167,7 +167,7 @@ Signed-off-by: Greg Kroah-Hartman if (rc != MIGRATEPAGE_SUCCESS) return rc; -@@ -552,7 +553,7 @@ int buffer_migrate_page(struct address_s +@@ -553,7 +554,7 @@ int buffer_migrate_page(struct address_s head = page_buffers(page);