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: 10502485 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 51DB760284 for ; Mon, 2 Jul 2018 21:55:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3289626E79 for ; Mon, 2 Jul 2018 21:55:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 246B628879; Mon, 2 Jul 2018 21:55:03 +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=-10.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, USER_IN_DEF_DKIM_WL autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B8DD226E79 for ; Mon, 2 Jul 2018 21:55:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AB2F96B028B; Mon, 2 Jul 2018 17:55:01 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id A640A6B028C; Mon, 2 Jul 2018 17:55:01 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9041E6B028D; Mon, 2 Jul 2018 17:55:01 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org 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) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references; bh=/eCyUzVEodDEJDj1KMPhPb1uhIgk/F30b0HI1HAROkg=; b=W2sbvkVDhebFh/In9TzW0asJfLdXQVG17PecI6NLWSMbrcziJZ0AWuWsRw9mYJ91Fx k/2vX6EO3sebyHeetP0htdrcYnL1QR6kyvwa6D3KBWf6DEza4Mp4J3wJZ1GOJ2Bf5dN1 DQi7NMg/maE5+4Byr9adVtLXjsdOBlgvrMBdegzyJRuy87Ls2AeBXkZ65ZhtEjd2+LoV 26S00Y0YVOSJEzT5rOOWcpuTxqDfiSHUl3SGnlkqJpuu8w3U3+VfJcuUSr44cSifZ0Re 2e+KBzCxRG5OYZpx92Mdv49N8bhrF6OwoLtx5LDxqblbx2fI8aNfeFv9svcXM0Og53vQ y6sg== X-Gm-Message-State: APt69E3f6ZzSwUxDd9S6DKlJGHSemuEx/0MbvCX5f+lTdesQhXbKiVM4 wd/hE6ReFObkBEe7ABr9Yx0Qd8U1p4bQ1+/xyIl6KVARZTPsKzjx9gnzpfLG6+yYKfwgZT0Ds6R apkgpLzsRMUUbzbZ/HQrUccF0ihqeSVfE/dJnmqDDkmLkWtZbplR3ZRggu9Ipb8yAfJdQF3bfU8 EfFC6MbEwX8QVunH25TWpX7QlPMUoAQhZtWrHGBJdqF+QLZRN/N6/vQ5w3SpGjxyTvUIO4fz9Je o048v5dBgLowU9mrTl4mkiCgIGlsdy9NnMXIhnlqecJjCvrg1lxMqZvMD8ei4MgCXq6Br5gOF1j zQUODodqHBEuL8ziBOM8OuUn5MInBDxqi7ohoqU6wXMWUq3ZVKXracbeUrv2HXRIslpGFypokvs W X-Received: by 2002:a17:902:6b05:: with SMTP id o5-v6mr27738131plk.67.1530568500992; Mon, 02 Jul 2018 14:55:00 -0700 (PDT) X-Received: by 2002:a17:902:6b05:: with SMTP id o5-v6mr27738104plk.67.1530568500315; Mon, 02 Jul 2018 14:55:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530568500; cv=none; d=google.com; s=arc-20160816; b=sZzpw8sRuIjUaBjyvvtBbnRZzYlkZGmWKg17buyhczfpXODEfq/OOg/cZVZbqV1xdr NASbPii6Wfw2Uh/MfYADTT+chr1HaRbyUMps8XBj56kmQSfbBZ/kWxkJI2lLbGsq7UuP qzO/gNxaEvl+37e+UjuMI7+2dXkuKJgp9usFKySKA8nZ+9+ZxIrOfXQ3fHCOhDH7dwWM 5M5JiZKI4aoiGihE+oq0aDVpPnfcw6A5Sa2rPs/eMSIxwncrHlpvxP/AYMWzBU7QF4iC PpHI/nFxyD/1H1WISk8B8rZd8NJ8cSUINldDyGasGe0WV2LsAA3MQWBdO906cXT4/xTA rUVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=/eCyUzVEodDEJDj1KMPhPb1uhIgk/F30b0HI1HAROkg=; b=nOGk/zxMkdN5dyQRXo14gA4gN7AvPdx30f2jva8InzrhAVz2/iI50bDopeOU01IRb8 Mw7VPygWK4bfF2kLKTtLNS1V/RpX62iHNQFZ9qSV3Xkaj7E0np9ytK0zKOKqR1R0lKHc /HHXIn5B/oKD+45gyshsay5GTVqsJiQlYw+F0Zo3Eo090LQrtUEiRkV8SKofUeiCmDDY 1TBB+t9vhbIPrr7X4XRajoc5qCnkI+XQ6soCCRlEYUnnYCevD5fmV5kgUhyGyNASjT2V 7zXeczgM+jGQUuA7YdOXZzjPjbPmZWUi4Y2TK4Bp/pDk1Y32x/eJzc8Bg+aFVVpUaZUy 4dug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=uGNWLr9g; spf=pass (google.com: domain of shakeelb@google.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=shakeelb@google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com 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) Received-SPF: pass (google.com: domain of shakeelb@google.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=uGNWLr9g; spf=pass (google.com: domain of shakeelb@google.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=shakeelb@google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com 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-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> X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: 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)) {