Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp565405ybz; Fri, 24 Apr 2020 05:32:32 -0700 (PDT) X-Google-Smtp-Source: APiQypLNVLQNl02s9hZL5stuyz2AuqsaGiY3hXCrO8iIt6DOktXuNvCdh04hsponm9o0ZDPWehHr X-Received: by 2002:a50:c0ce:: with SMTP id r14mr6773331edf.298.1587731551934; Fri, 24 Apr 2020 05:32:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587731551; cv=none; d=google.com; s=arc-20160816; b=N5jYPtjM/bibYCC4wD4JLFfymqD+IvMvt6HZfNlObvQ72zD04kA0n2xfBpCiB+TnUa v+ebeeHcUkhYSp8zZIABPNqjiAGlgDEFQtq8tQNxuIBP6iY7StQhFEwIVfSYg/wWCg6k rxb3wUjPTa1ElWLyhQu1BHJqcgXToSufTl4SHQUw60ydKr0XCqlkjIVT97qD4++YLWIJ bLsy+qxdo38g1hZEZl64PwpgMPMsonys0o9N2+shev6ND5T9D7NPpz2GQpgK4EiNdXb3 MTNkAJ2Kt5fDdx76Rdr+gQ8VIF6BP7UhQEr989Ie92OAnkPIkO1di91eFzIQdWAzDvjF /AAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=/dZAVlkULWzpaQt3fOB9eujMBn5kWOMeezy8UzoaQUc=; b=VXmPLyFEDCp7AZHQwn/QgBHQiK4uei+4gCctvwVRsAPJyF/4yXOHHZKNQZ8g/F+Xo6 a1MYCixizr8JXDIf35xdCR2TdwThB6mMYdVtwlJK1AAFSu5+eT69WP3jv2rT4vGFYkSS WoN5sqlaG3x0eBDHcH1Gwdhu3o3+LuYe09X9XfeEVcyhlHZKB0i52JMUP4B1esMsb74u XgPhA3N77tyH7SDViOPpCETUjztBlNqtwQpiPlwAhYHrDGlNeCgw7X4xc78+HItmhr8T GNJR1jCe8xbaEZ5OwjrFkM4b8g1ic0y9cM6i7yfbhbzQKL8AGGdlp64RjanvibtCrPzg x07g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=eFvoWdkn; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s11si3001173edg.77.2020.04.24.05.32.07; Fri, 24 Apr 2020 05:32:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=eFvoWdkn; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727889AbgDXMXP (ORCPT + 99 others); Fri, 24 Apr 2020 08:23:15 -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-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@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