The patch titled Subject: memcg-prevent-from-oom-with-too-many-dirty-pages-fix has been added to the -mm tree. Its filename is memcg-prevent-from-oom-with-too-many-dirty-pages-fix.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: memcg-prevent-from-oom-with-too-many-dirty-pages-fix Cc: Fengguang Wu <fengguang.wu@xxxxxxxxx> Cc: Greg Thelen <gthelen@xxxxxxxxxx> Cc: Hugh Dickins <hughd@xxxxxxxxxx> Cc: Johannes Weiner <hannes@xxxxxxxxxxx> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx> Cc: Mel Gorman <mgorman@xxxxxxx> Cc: Michal Hocko <mhocko@xxxxxxx> Cc: Minchan Kim <minchan@xxxxxxxxxx> Cc: Rik van Riel <riel@xxxxxxxxxx> Cc: Ying Han <yinghan@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/vmscan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN mm/vmscan.c~memcg-prevent-from-oom-with-too-many-dirty-pages-fix mm/vmscan.c --- a/mm/vmscan.c~memcg-prevent-from-oom-with-too-many-dirty-pages-fix +++ a/mm/vmscan.c @@ -726,8 +726,8 @@ static unsigned long shrink_page_list(st * writeback from reclaim and there is nothing else to * reclaim. */ - if (PageReclaim(page) - && may_enter_fs && !global_reclaim(sc)) + if (!global_reclaim(sc) && PageReclaim(page) && + may_enter_fs) wait_on_page_writeback(page); else { nr_writeback++; _ Subject: Subject: memcg-prevent-from-oom-with-too-many-dirty-pages-fix Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are linux-next.patch linux-next-git-rejects.patch i-need-old-gcc.patch arch-alpha-kernel-systblss-remove-debug-check.patch drivers-block-nvmec-stop-breaking-my-i386-build.patch drivers-power-power_supply_corec-partially-fix.patch mm-fix-slab-page-_count-corruption-when-using-slub-fix.patch tmpfs-implement-numa-node-interleaving-fix.patch arch-x86-platform-iris-irisc-register-a-platform-device-and-a-platform-driver.patch fs-symlink-restrictions-on-sticky-directories.patch fs-hardlink-creation-restrictions.patch hfs-get-rid-of-hfs_sync_super-checkpatch-fixes.patch mm.patch mm-make-vb_alloc-more-foolproof-fix.patch mm-compaction-handle-incorrect-migrate_unmovable-type-pageblocks.patch mm-compaction-handle-incorrect-migrate_unmovable-type-pageblocks-fix.patch memcg-prevent-from-oom-with-too-many-dirty-pages-fix.patch avr32-mm-faultc-port-oom-changes-to-do_page_fault-fix.patch nmi-watchdog-fix-for-lockup-detector-breakage-on-resume.patch kmsg-dev-kmsg-properly-return-possible-copy_from_user-failure.patch btrfs-use-printk_get_level-and-printk_skip_level-add-__printf-fix-fallout-fix.patch btrfs-use-printk_get_level-and-printk_skip_level-add-__printf-fix-fallout-checkpatch-fixes.patch backlight-l4f00242t03-use-devm_gpio_request_one-fix.patch string-introduce-memweight-fix.patch kmod-avoid-deadlock-from-recursive-kmod-call.patch fork-use-vma_pages-to-simplify-the-code-fix.patch fs-cachefiles-add-support-for-large-files-in-filesystem-caching-fix.patch notify_change-check-that-i_mutex-is-held.patch journal_add_journal_head-debug.patch mutex-subsystem-synchro-test-module-fix.patch slab-leaks3-default-y.patch put_bh-debug.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html