From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 36F0FC2D0A3 for ; Mon, 26 Oct 2020 23:59:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DED7920773 for ; Mon, 26 Oct 2020 23:59:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603756761; bh=AXS4eiwCm9+CjfvQITmJBblMM8wvZGcfxkf9hEHwgTQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=UiTC1O6RDjhmBZqD9CJFGjmmB0Ic+V00E1I7F46VaYWYRXJ4rF3OufK8Rp6ts8wUv 5d9UnL5akFHX4x5JVQY1gJrzbqgjifeGJrhof7ST+G0ggVI6r17sSPUUekh4BwEoc0 W7NvAFr9BJDcmG6ZE+cXPZku/HBQebhl8Ll0qEFw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2436815AbgJZX5e (ORCPT ); Mon, 26 Oct 2020 19:57:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:60350 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2410442AbgJZXy1 (ORCPT ); Mon, 26 Oct 2020 19:54:27 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 25E4220882; Mon, 26 Oct 2020 23:54:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603756466; bh=AXS4eiwCm9+CjfvQITmJBblMM8wvZGcfxkf9hEHwgTQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fi/8I02kUEIXiMrcEB2HA/WM70gVuW5eWyGiWJXh+hHd2hCCb1WEbA5UAPO78ws74 p0ut4je54oDBd+IqnlcaT1JBGforFgQILNoZ0ke7aIfY3spTlg76DLRpMLh8FFnQXr uVWPSeLRj3dH9/8B/YlW8RsUVvCAbTtU9OQu78hg= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Bob Peterson , Andreas Gruenbacher , Sasha Levin , cluster-devel@redhat.com Subject: [PATCH AUTOSEL 5.8 114/132] gfs2: call truncate_inode_pages_final for address space glocks Date: Mon, 26 Oct 2020 19:51:46 -0400 Message-Id: <20201026235205.1023962-114-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201026235205.1023962-1-sashal@kernel.org> References: <20201026235205.1023962-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Bob Peterson [ Upstream commit ee1e2c773e4f4ce2213f9d77cc703b669ca6fa3f ] Before this patch, we were not calling truncate_inode_pages_final for the address space for glocks, which left the possibility of a leak. We now take care of the problem instead of complaining, and we do it during glock tear-down.. Signed-off-by: Bob Peterson Signed-off-by: Andreas Gruenbacher Signed-off-by: Sasha Levin --- fs/gfs2/glock.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c index f92876f4f37a1..d8194479b8328 100644 --- a/fs/gfs2/glock.c +++ b/fs/gfs2/glock.c @@ -270,7 +270,12 @@ static void __gfs2_glock_put(struct gfs2_glock *gl) gfs2_glock_remove_from_lru(gl); spin_unlock(&gl->gl_lockref.lock); GLOCK_BUG_ON(gl, !list_empty(&gl->gl_holders)); - GLOCK_BUG_ON(gl, mapping && mapping->nrpages && !gfs2_withdrawn(sdp)); + if (mapping) { + truncate_inode_pages_final(mapping); + if (!gfs2_withdrawn(sdp)) + GLOCK_BUG_ON(gl, mapping->nrpages || + mapping->nrexceptional); + } trace_gfs2_glock_put(gl); sdp->sd_lockstruct.ls_ops->lm_put_lock(gl); } -- 2.25.1