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 B1890C55191 for ; Fri, 24 Apr 2020 12:23:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8830E20700 for ; Fri, 24 Apr 2020 12:23:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587731002; bh=zjvN3hJ0Ii71XOlJ4IrX9uuc3064lK42dajzV9pEXPY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=m5/Wvu3GGdE+zMwYjVTGoVY7mjLfj91Tg9Bi2ltooVoQpSLvRTYtPlhDPZ2P0mce8 55AgI0M5ideHyzvREDZbzv7Pkf4J993vJPdI//FQdEdYddQ+GM4NGwOoFtXqlKndvy lSp64aMV3UR/8Q6Q13793BzNWR7NvW1eeC55DO6E= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727947AbgDXMXV (ORCPT ); Fri, 24 Apr 2020 08:23:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:52846 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727021AbgDXMXP (ORCPT ); Fri, 24 Apr 2020 08:23:15 -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 C6BDB20776; Fri, 24 Apr 2020 12:23:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587730994; bh=zjvN3hJ0Ii71XOlJ4IrX9uuc3064lK42dajzV9pEXPY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eFvoWdknT9gxVvYrM78/IyeiomqtiIR6xKXwCqD3y1D5MamxCKcKsw7uhxLJafpYj dDQDyow7C/4eWKRvDift3v4QxvspW7QXlfruaNZ589yOtuxgieStgFo+GUyaB/QaJM JIWUNycKitin439siTVnaAFbogAEp6Cu3xZYvAHA= 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.6 32/38] ext4: use matching invalidatepage in ext4_writepage Date: Fri, 24 Apr 2020 08:22:30 -0400 Message-Id: <20200424122237.9831-32-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200424122237.9831-1-sashal@kernel.org> References: <20200424122237.9831-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 37f65ad0d823d..4d3c81fd0902e 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -1974,7 +1974,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