[folded-merged] fs-fsnotify-account-fsnotify-metadata-to-kmemcg-fix.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: fs-fsnotify-account-fsnotify-metadata-to-kmemcg.patch.cleanup
has been removed from the -mm tree.  Its filename was
     fs-fsnotify-account-fsnotify-metadata-to-kmemcg-fix.patch

This patch was dropped because it was folded into fs-fsnotify-account-fsnotify-metadata-to-kmemcg.patch

------------------------------------------------------
From: Shakeel Butt <shakeelb@xxxxxxxxxx>
Subject: fs-fsnotify-account-fsnotify-metadata-to-kmemcg.patch.cleanup

use GFP_KERNEL_ACCOUNT rather than open-coding it

Link: http://lkml.kernel.org/r/20180702215439.211597-1-shakeelb@xxxxxxxxxx
Signed-off-by: Shakeel Butt <shakeelb@xxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxxxx>
Cc: Jan Kara <jack@xxxxxxx>
Cc: Amir Goldstein <amir73il@xxxxxxxxx>
Cc: Greg Thelen <gthelen@xxxxxxxxxx>
Cc: Johannes Weiner <hannes@xxxxxxxxxxx>
Cc: Vladimir Davydov <vdavydov.dev@xxxxxxxxx>
Cc: Roman Gushchin <guro@xxxxxx>
Cc: Alexander Viro <viro@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 fs/notify/fanotify/fanotify.c        |    2 +-
 fs/notify/inotify/inotify_fsnotify.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- a/fs/notify/fanotify/fanotify.c~fs-fsnotify-account-fsnotify-metadata-to-kmemcg-fix
+++ a/fs/notify/fanotify/fanotify.c
@@ -142,7 +142,7 @@ struct fanotify_event_info *fanotify_all
 						 const struct path *path)
 {
 	struct fanotify_event_info *event = NULL;
-	gfp_t gfp = GFP_KERNEL | __GFP_ACCOUNT;
+	gfp_t gfp = GFP_KERNEL_ACCOUNT;
 
 	/*
 	 * For queues with unlimited length lost events are not expected and
--- a/fs/notify/inotify/inotify_fsnotify.c~fs-fsnotify-account-fsnotify-metadata-to-kmemcg-fix
+++ a/fs/notify/inotify/inotify_fsnotify.c
@@ -101,7 +101,7 @@ int inotify_handle_event(struct fsnotify
 
 	/* Whoever is interested in the event, pays for the allocation. */
 	memalloc_use_memcg(group->memcg);
-	event = kmalloc(alloc_len, GFP_KERNEL | __GFP_ACCOUNT);
+	event = kmalloc(alloc_len, GFP_KERNEL_ACCOUNT);
 	memalloc_unuse_memcg();
 
 	if (unlikely(!event)) {
_

Patches currently in -mm which might be from shakeelb@xxxxxxxxxx are

fs-fsnotify-account-fsnotify-metadata-to-kmemcg.patch
fs-mm-account-buffer_head-to-kmemcg.patch
fs-mm-account-buffer_head-to-kmemcgpatchfix.patch




[Index of Archives]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux