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=-9.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,URIBL_BLOCKED,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 BEEA3C282CE for ; Wed, 22 May 2019 19:21:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 84D61217D4 for ; Wed, 22 May 2019 19:21:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558552918; bh=FprT0T9ceOzSbKvrTxOKSrB3aus9Ery68a7fs8LZ6xA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=mwSfEwF2hVQuQW/6zHRv3l0N4aShijv3dfca8kCaLLNw1gTsc0nyW4GVXA7GUbo8X 9p6IJEBIZzVyxw9I587+VB6rTkB2pKZyyn7lJmEvjETH5v1tRk8ePHT8FjrNRcL20D HjGM1vfWGFSVGl8JTjSbenn5/FJspqQOQtlyYzcU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730231AbfEVTV5 (ORCPT ); Wed, 22 May 2019 15:21:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:42496 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730164AbfEVTVw (ORCPT ); Wed, 22 May 2019 15:21:52 -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 617A721473; Wed, 22 May 2019 19:21:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558552912; bh=FprT0T9ceOzSbKvrTxOKSrB3aus9Ery68a7fs8LZ6xA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=02xJBetu1XSHcasBiwRmycMYdK/oT3CCg27A2ZTUClKQ0hrooDUoNnHPVDbiuP9vv yYwqYg8BUGgGfeuc9xeH1vS/pMKTTpNGl5XPQufMYvEemNL4q1aF70t5/G7cbE+yDw UWfcJHwDLs5Vl2bX7aqRooLFbqyPSMNSGfluBu3g= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Martin Brandenburg , Mike Marshall , Sasha Levin , devel@lists.orangefs.org Subject: [PATCH AUTOSEL 5.1 025/375] orangefs: truncate before updating size Date: Wed, 22 May 2019 15:15:25 -0400 Message-Id: <20190522192115.22666-25-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190522192115.22666-1-sashal@kernel.org> References: <20190522192115.22666-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: Martin Brandenburg [ Upstream commit 33713cd09ccdc1e01b10d0782ae60200d4989553 ] Otherwise we race with orangefs_writepage/orangefs_writepages which and does not expect i_size < page_offset. Fixes xfstests generic/129. Signed-off-by: Martin Brandenburg Signed-off-by: Mike Marshall Signed-off-by: Sasha Levin --- fs/orangefs/inode.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/fs/orangefs/inode.c b/fs/orangefs/inode.c index c3334eca18c7e..3260f757c0803 100644 --- a/fs/orangefs/inode.c +++ b/fs/orangefs/inode.c @@ -172,7 +172,11 @@ static int orangefs_setattr_size(struct inode *inode, struct iattr *iattr) } orig_size = i_size_read(inode); - truncate_setsize(inode, iattr->ia_size); + /* This is truncate_setsize in a different order. */ + truncate_pagecache(inode, iattr->ia_size); + i_size_write(inode, iattr->ia_size); + if (iattr->ia_size > orig_size) + pagecache_isize_extended(inode, orig_size, iattr->ia_size); new_op = op_alloc(ORANGEFS_VFS_OP_TRUNCATE); if (!new_op) -- 2.20.1