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=-10.1 required=3.0 tests=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=unavailable 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 544AFC55194 for ; Fri, 24 Apr 2020 12:29:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 23F1E20736 for ; Fri, 24 Apr 2020 12:29:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587731370; bh=1sRtclu5YtF/BdA/p0xwCVoFQqyA2qzRIAsl+w9VUSc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=oezFKZcTbmrL1pmtr32SRsD+fxPBralvIr+sJZSwJIRmX94o96baSx2K5ThEq3NcC nX/E8f/onfwhEE3CLDxLH1N/iBUJu9x5B27OoaYtKIisTQ0fqCMI3twX422dTxWq5F LvrBITXfsVmN3bhDFBkjJbpdLQ79OrNCoCz1AXFM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728227AbgDXMX7 (ORCPT ); Fri, 24 Apr 2020 08:23:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:53966 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728159AbgDXMXt (ORCPT ); Fri, 24 Apr 2020 08:23:49 -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 ADBF420776; Fri, 24 Apr 2020 12:23:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587731029; bh=1sRtclu5YtF/BdA/p0xwCVoFQqyA2qzRIAsl+w9VUSc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q3hL84gRdKAlKGRnO/1hQvw5TjsNssUbLma7puWD7BHahnGngSb6rWC2YT71Gn0TH kmoBsO3Kjuq3vXpBh+oCU5hIhBvp8ukk4Nf1fzDHnliUDphU5iiMXxCepZaC5o9NnZ /3T+IHnCbRdw5c3vqgs44x77U69GQM+tpjpT/gB8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: yangerkun , Theodore Ts'o , Ritesh Harjani , Jan Kara , Sasha Levin , linux-ext4@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 22/26] ext4: use matching invalidatepage in ext4_writepage Date: Fri, 24 Apr 2020 08:23:19 -0400 Message-Id: <20200424122323.10194-22-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200424122323.10194-1-sashal@kernel.org> References: <20200424122323.10194-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: yangerkun [ Upstream commit c2a559bc0e7ed5a715ad6b947025b33cb7c05ea7 ] Run generic/388 with journal data mode sometimes may trigger the warning in ext4_invalidatepage. Actually, we should use the matching invalidatepage in ext4_writepage. Signed-off-by: yangerkun Signed-off-by: Theodore Ts'o Reviewed-by: Ritesh Harjani Reviewed-by: Jan Kara Link: https://lore.kernel.org/r/20200226041002.13914-1-yangerkun@huawei.com Signed-off-by: Theodore Ts'o Signed-off-by: Sasha Levin --- fs/ext4/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index b9473fcc110fd..7e0c77de551bb 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -2131,7 +2131,7 @@ static int ext4_writepage(struct page *page, bool keep_towrite = false; if (unlikely(ext4_forced_shutdown(EXT4_SB(inode->i_sb)))) { - ext4_invalidatepage(page, 0, PAGE_SIZE); + inode->i_mapping->a_ops->invalidatepage(page, 0, PAGE_SIZE); unlock_page(page); return -EIO; } -- 2.20.1