From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl0-f70.google.com (mail-pl0-f70.google.com [209.85.160.70]) by kanga.kvack.org (Postfix) with ESMTP id 4D14C6B028B for ; Mon, 2 Jul 2018 17:55:01 -0400 (EDT) Received: by mail-pl0-f70.google.com with SMTP id p91-v6so10512199plb.12 for ; Mon, 02 Jul 2018 14:55:01 -0700 (PDT) Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id t21-v6sor3959028pgn.43.2018.07.02.14.55.00 for (Google Transport Security); Mon, 02 Jul 2018 14:55:00 -0700 (PDT) From: Shakeel Butt Subject: [PATCH] fs-fsnotify-account-fsnotify-metadata-to-kmemcg.patch.cleanup Date: Mon, 2 Jul 2018 14:54:39 -0700 Message-Id: <20180702215439.211597-1-shakeelb@google.com> In-Reply-To: <20180627191250.209150-2-shakeelb@google.com> References: <20180627191250.209150-2-shakeelb@google.com> Sender: owner-linux-mm@kvack.org List-ID: To: Andrew Morton Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Shakeel Butt Hi Andres, this is a small cleanup to the patch "fs: fsnotify: account fsnotify metadata to kmemcg". Please squash. Signed-off-by: Shakeel Butt --- 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