lkml.org 
[lkml]   [2018]   [Jul]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] fs-fsnotify-account-fsnotify-metadata-to-kmemcg.patch.cleanup
Date
Hi Andres, this is a small cleanup to the patch "fs: fsnotify: account
fsnotify metadata to kmemcg". Please squash.

Signed-off-by: Shakeel Butt <shakeelb@google.com>
---
fs/notify/fanotify/fanotify.c | 2 +-
fs/notify/inotify/inotify_fsnotify.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/notify/fanotify/fanotify.c b/fs/notify/fanotify/fanotify.c
index 6ff1f75d156d..eb4e75175cfb 100644
--- a/fs/notify/fanotify/fanotify.c
+++ b/fs/notify/fanotify/fanotify.c
@@ -142,7 +142,7 @@ struct fanotify_event_info *fanotify_alloc_event(struct fsnotify_group *group,
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
diff --git a/fs/notify/inotify/inotify_fsnotify.c b/fs/notify/inotify/inotify_fsnotify.c
index 52e167d04b11..f4184b4f3815 100644
--- a/fs/notify/inotify/inotify_fsnotify.c
+++ b/fs/notify/inotify/inotify_fsnotify.c
@@ -101,7 +101,7 @@ int inotify_handle_event(struct fsnotify_group *group,

/* 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)) {
--
2.18.0.399.gad0ab374a1-goog
\
 
 \ /
  Last update: 2018-07-02 23:57    [W:0.646 / U:1.772 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site