The patch titled Subject: fs-fsnotify-account-fsnotify-metadata-to-kmemcg-fix has been added to the -mm tree. Its filename is fs-fsnotify-account-fsnotify-metadata-to-kmemcg-fix.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/fs-fsnotify-account-fsnotify-metadata-to-kmemcg-fix.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/fs-fsnotify-account-fsnotify-metadata-to-kmemcg-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: fs-fsnotify-account-fsnotify-metadata-to-kmemcg-fix fix CONFIG_MEMCG=n build Reported-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx> Cc: Amir Goldstein <amir73il@xxxxxxxxx> Cc: Christoph Lameter <cl@xxxxxxxxx> Cc: David Rientjes <rientjes@xxxxxxxxxx> Cc: Greg Thelen <gthelen@xxxxxxxxxx> Cc: Jan Kara <jack@xxxxxxx> Cc: Johannes Weiner <hannes@xxxxxxxxxxx> Cc: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx> Cc: Mel Gorman <mgorman@xxxxxxx> Cc: Michal Hocko <mhocko@xxxxxxxxxx> Cc: Pekka Enberg <penberg@xxxxxxxxxx> Cc: Shakeel Butt <shakeelb@xxxxxxxxxx> Cc: Vladimir Davydov <vdavydov.dev@xxxxxxxxx> Cc: Vlastimil Babka <vbabka@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/notify/group.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN fs/notify/dnotify/dnotify.c~fs-fsnotify-account-fsnotify-metadata-to-kmemcg-fix fs/notify/dnotify/dnotify.c diff -puN fs/notify/fanotify/fanotify.c~fs-fsnotify-account-fsnotify-metadata-to-kmemcg-fix fs/notify/fanotify/fanotify.c diff -puN fs/notify/fanotify/fanotify_user.c~fs-fsnotify-account-fsnotify-metadata-to-kmemcg-fix fs/notify/fanotify/fanotify_user.c diff -puN fs/notify/group.c~fs-fsnotify-account-fsnotify-metadata-to-kmemcg-fix fs/notify/group.c --- a/fs/notify/group.c~fs-fsnotify-account-fsnotify-metadata-to-kmemcg-fix +++ a/fs/notify/group.c @@ -38,7 +38,7 @@ static void fsnotify_final_destroy_group group->ops->free_group_priv(group); if (group->memcg) - css_put(&group->memcg->css); + mem_cgroup_put(group->memcg); kfree(group); } diff -puN fs/notify/inotify/inotify_fsnotify.c~fs-fsnotify-account-fsnotify-metadata-to-kmemcg-fix fs/notify/inotify/inotify_fsnotify.c diff -puN fs/notify/inotify/inotify_user.c~fs-fsnotify-account-fsnotify-metadata-to-kmemcg-fix fs/notify/inotify/inotify_user.c diff -puN include/linux/fsnotify_backend.h~fs-fsnotify-account-fsnotify-metadata-to-kmemcg-fix include/linux/fsnotify_backend.h diff -puN include/linux/memcontrol.h~fs-fsnotify-account-fsnotify-metadata-to-kmemcg-fix include/linux/memcontrol.h diff -puN mm/memcontrol.c~fs-fsnotify-account-fsnotify-metadata-to-kmemcg-fix mm/memcontrol.c _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are i-need-old-gcc.patch mm-memblock-hardcode-the-end_pfn-being-1-fix.patch mm-memblock-hardcode-the-end_pfn-being-1-fix-fix.patch arm-arch-arm-include-asm-pageh-needs-personalityh.patch ocfs2-without-quota-support-try-to-avoid-calling-quota-recovery-checkpatch-fixes.patch mm.patch mm-initialize-pages-on-demand-during-boot-fix-4-fix.patch mm-page_alloc-skip-over-regions-of-invalid-pfns-on-uma-fix.patch direct-io-minor-cleanups-in-do_blockdev_direct_io-fix.patch mm-fix-races-between-swapoff-and-flush-dcache-fix.patch list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch mm-oom-cgroup-aware-oom-killer-fix.patch mm-oom-docs-describe-the-cgroup-aware-oom-killer-fix-2-fix.patch proc-add-seq_put_decimal_ull_width-to-speed-up-proc-pid-smaps-fix.patch vsprintf-remove-accidental-vla-usage-fix.patch sysctl-add-flags-to-support-min-max-range-clamping-fix.patch linux-next-rejects.patch linux-next-fixup.patch linux-next-git-rejects.patch drivers-gpu-drm-i915-intel_guc_logc-work-around-gcc-444-union-initializer-issue.patch fs-fsnotify-account-fsnotify-metadata-to-kmemcg-fix.patch headers-untangle-kmemleakh-from-mmh-fix.patch kernel-forkc-export-kernel_thread-to-modules.patch slab-leaks3-default-y.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