From patchwork Mon Apr 2 14:38:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 10319895 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 8D7EB60247 for ; Mon, 2 Apr 2018 14:39:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 68A10286DD for ; Mon, 2 Apr 2018 14:39:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5CFB428A94; Mon, 2 Apr 2018 14:39:14 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham 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 5AABE286DD for ; Mon, 2 Apr 2018 14:39:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752842AbeDBOjL (ORCPT ); Mon, 2 Apr 2018 10:39:11 -0400 Received: from heliosphere.sirena.org.uk ([172.104.155.198]:43108 "EHLO heliosphere.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751418AbeDBOiW (ORCPT ); Mon, 2 Apr 2018 10:38:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=2Vcz4Pl7NeTFnshp90L8XtoyBpE7fUQ1NIZZbAGl27U=; b=Nn1lpwi2ZgJ1 pI9bVIElsYZYppU0XZDhRs9jZB6rieoG5t19O7DQW8X4mDQuGYmVu5/JOAx43B/h2xtsDG9riH7F+ hLI+S77TuDCq6cRhky4U1Vuy2RSK4C/kVCiSRoXLQPpRaKz3ZaIFSwc1zh0jT/QpkFAYxfqOgg2zo kec3I=; Received: from [2001:470:1f1d:6b5:7e7a:91ff:fede:4a45] (helo=finisterre.ee.mobilebroadband) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1f30az-00013w-0B; Mon, 02 Apr 2018 14:38:05 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id 4980F44007A; Mon, 2 Apr 2018 15:38:04 +0100 (BST) From: Mark Brown To: Andrew Morton Cc: Randy Dunlap , Amir Goldstein , Christoph Lameter , David Rientjes , Greg Thelen , Jan Kara , Johannes Weiner , Joonsoo Kim , Mel Gorman , Michal Hocko , Pekka Enberg , Shakeel Butt , Vladimir Davydov , Vlastimil Babka , Stephen Rothwell , linux-spi@vger.kernel.org Subject: Applied "fs-fsnotify-account-fsnotify-metadata-to-kmemcg-fix" to the spi tree In-Reply-To: Message-Id: <20180402143804.4980F44007A@finisterre.ee.mobilebroadband> Date: Mon, 2 Apr 2018 15:38:04 +0100 (BST) Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The patch fs-fsnotify-account-fsnotify-metadata-to-kmemcg-fix has been applied to the spi tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark From 2825db0aac330ac4540c5797fe623c9c1c0603ae Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Fri, 23 Mar 2018 11:29:04 +1100 Subject: [PATCH] fs-fsnotify-account-fsnotify-metadata-to-kmemcg-fix fix CONFIG_MEMCG=n build Reported-by: Randy Dunlap Cc: Amir Goldstein Cc: Christoph Lameter Cc: David Rientjes Cc: Greg Thelen Cc: Jan Kara Cc: Johannes Weiner Cc: Joonsoo Kim Cc: Mel Gorman Cc: Michal Hocko Cc: Pekka Enberg Cc: Shakeel Butt Cc: Vladimir Davydov Cc: Vlastimil Babka Signed-off-by: Andrew Morton Signed-off-by: Stephen Rothwell --- fs/notify/group.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/notify/group.c b/fs/notify/group.c index df14a66ce067..3e56459f4773 100644 --- a/fs/notify/group.c +++ b/fs/notify/group.c @@ -38,7 +38,7 @@ static void fsnotify_final_destroy_group(struct fsnotify_group *group) group->ops->free_group_priv(group); if (group->memcg) - css_put(&group->memcg->css); + mem_cgroup_put(group->memcg); kfree(group); }