From patchwork Mon Jul 2 21:54:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shakeel Butt X-Patchwork-Id: 10502489 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D912960284 for ; Mon, 2 Jul 2018 21:55:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C9A9726E79 for ; Mon, 2 Jul 2018 21:55:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BE54528879; Mon, 2 Jul 2018 21:55:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, USER_IN_DEF_DKIM_WL autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 73A6E26E79 for ; Mon, 2 Jul 2018 21:55:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932113AbeGBVzS (ORCPT ); Mon, 2 Jul 2018 17:55:18 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:40372 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753476AbeGBVzB (ORCPT ); Mon, 2 Jul 2018 17:55:01 -0400 Received: by mail-pf0-f196.google.com with SMTP id z24-v6so8097372pfe.7 for ; Mon, 02 Jul 2018 14:55:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/eCyUzVEodDEJDj1KMPhPb1uhIgk/F30b0HI1HAROkg=; b=uGNWLr9gube3Yj7ltQ2/qTAbwQcDex9b88Z9EJ/J9rav/THRDbDmzZnj5BEIMwTPts UuitwjCH2cXHoVbN/Nl+Ygc4xMKj0KOKRbv9OGg1UhUM87JcLKH4sadmjWoVv4IpvfSI nffCq0X2+qwn9E4K3n0o/LDVbUCMIwFRZqeGvn3SrPIBWouQ1sURrVmc7btJZ6NIF7fE eBJRXOF/j4WDvxtD02Pxb9h2qlXBox40enNm9IarXa9Kv80M0LXMqm3C/VlanH+nL0Qs 7J+YcRaHOWgkX5PPb1lUxl7WsqviQuY1VYRyQW50D+ByNTq8+syTX76KptPMW3sz2v/v Th7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=/eCyUzVEodDEJDj1KMPhPb1uhIgk/F30b0HI1HAROkg=; b=ZG4bHhNSbRST+lE+U9OawpDIitzrqbgdp2CkE9TIW3gfEqLDFIO3r705lJRHABHeKE y2e4bIFUnzVWbXbeND4stMlGetY01ZlArDmTV/ZvqNqo3E2Gr0Q1p9HSz82b+5PGf56N KIITdptMTRrAS8i2B3ziB72NwoV6gHvQ7nxBwICxXOf7H5XTDUndgX2Vf4EDwvsg0SF3 GokpfZHhDosCbyaccP1ANbiv0EvR3gTSVDxIiQbQcHb10yyydsw89OgkXJxZkWITxaia icERAo7QK+xVAGZAiwHHv/7o2FTnLMXoV4vi1zgFr9gtjSmz42atQP/QmqOZGraIEGVb zoxg== X-Gm-Message-State: APt69E38DQwyYGQxkVEJq4D8u++oT/0ewKEiqh58hP6Was1B+35Pm3/2 YCerlp0Cfkbyk21kFtmDrOaw9A== X-Google-Smtp-Source: AAOMgpdIiH2m3NRo5hW5XQYly2dDF6q51i7PwRwru+MnSGZG7g4IXfWp8CaDS5vi6eyPrBQMfNGjrA== X-Received: by 2002:a63:c20:: with SMTP id b32-v6mr4351698pgl.400.1530568499617; Mon, 02 Jul 2018 14:54:59 -0700 (PDT) Received: from shakeelb.mtv.corp.google.com ([2620:15c:2cb:201:3a5f:3a4f:fa44:6b63]) by smtp.gmail.com with ESMTPSA id t78-v6sm10528386pfa.160.2018.07.02.14.54.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Jul 2018 14:54:58 -0700 (PDT) From: Shakeel Butt To: Andrew Morton Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, 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> X-Mailer: git-send-email 2.18.0.399.gad0ab374a1-goog In-Reply-To: <20180627191250.209150-2-shakeelb@google.com> References: <20180627191250.209150-2-shakeelb@google.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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)) {