Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp690711ybv; Thu, 13 Feb 2020 07:50:24 -0800 (PST) X-Google-Smtp-Source: APXvYqwNO4dUmCcZe8g5ydDuoG6Gnwu0rMxMG5pms9sAd011ys02tbC1jXGFzF7853fyKDc1k38I X-Received: by 2002:a54:4791:: with SMTP id o17mr3199505oic.70.1581609024763; Thu, 13 Feb 2020 07:50:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1581609024; cv=none; d=google.com; s=arc-20160816; b=HpBkqUW4lCkmzsPafeLdRohkrCybqfWmGL6ERKakzU+7Ax5wbGB2LVoCANmnMtSNAJ YcuO6eIlQA4L8aTrkkLddCx7xSBfP9u1AsxFSTZ7GFrj6vGNZAjRi7x3fv6AI6i2mnLQ uOqCp2OR1ZCZbqzdISYM+QbFvk0NBZURjz+e7wZlbAKYu/72uV+ejyM/Byojum92N9Ln gSWrmCWFq9YrPfcx1c0FRrJMF35K3agsz9UEMyYTpPDhWSNeNL89K0rB43BUc25INsRj soRNE5OfSp7qjgRcrryjd/lkYjqarV5JIhDcm1Bg64QTx9zDsNqZJrwug0+gQhGAb+fX weXA== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=lxF18afUOYz9Gs/JPo+/UswIluigprrK2Rvizi7PPJI=; b=YT24CCy+WU/ykzfYzKGOIA5Li/s/taTXUSHLsKI88lUR1xFEPPdUC+FdXqIi6Ej+19 NJf58TXEGe2ymWWDLrzgsYjUugFaw2iF0TOxGVya5IH+nGwOOmNlPO6LJqHWYlQdtCua i/rzbiId2gD5dd0DzJ73IUprGIb2ZGjDS0srJ9ZJhxeLl2qZQIuBs9VQ9SDHHCSJVnQv CYysYlGXsauBL0dR51ahRyTYi36fBw0b1acLprlqXYa5mf1/Z35NrPC7gUMs3GpjOtIN q0qDwiMkPwRfCNJ4TatCTFNpqyE0wBLGF/TKF7YrImIQoTmITz2fV89v5QQw5pe3jIbh yG1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=1OQ8zSZJ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s22si1427080otq.100.2020.02.13.07.50.12; Thu, 13 Feb 2020 07:50:24 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=1OQ8zSZJ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388028AbgBMPuK (ORCPT + 99 others); Thu, 13 Feb 2020 10:50:10 -0500 Received: from mail.kernel.org ([198.145.29.99]:45782 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387585AbgBMP0b (ORCPT ); Thu, 13 Feb 2020 10:26:31 -0500 Received: from localhost (unknown [104.132.1.104]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B770B222C2; Thu, 13 Feb 2020 15:26:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581607590; bh=65fBfyQPv1VaRhQVaGHQ7hfbA9ZUL+AOopUzXpUIHtg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1OQ8zSZJiA7/A33G2lhie3bJwwuHwP+vVPULNrEzvnGN37XSwGUdilMZxZNW01sXH CXcp9LSDelc4qo0JnU0FWsVjTNWwUqirgYM9xkrOE7D97DvtvCq/6YlOUXK5ppb81P t/sSWG2XYVJlDHTjtI3oCZPqvif4xsd8hSkxAe9A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Trond Myklebust , Anna Schumaker Subject: [PATCH 4.19 13/52] NFS: Revalidate the file size on a fatal write error Date: Thu, 13 Feb 2020 07:20:54 -0800 Message-Id: <20200213151816.368564307@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200213151810.331796857@linuxfoundation.org> References: <20200213151810.331796857@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Trond Myklebust commit 0df68ced55443243951d02cc497be31fadf28173 upstream. If we suffer a fatal error upon writing a file, which causes us to need to revalidate the entire mapping, then we should also revalidate the file size. Fixes: d2ceb7e57086 ("NFS: Don't use page_file_mapping after removing the page") Signed-off-by: Trond Myklebust Signed-off-by: Anna Schumaker Signed-off-by: Greg Kroah-Hartman --- fs/nfs/write.c | 8 ++++++++ 1 file changed, 8 insertions(+) --- a/fs/nfs/write.c +++ b/fs/nfs/write.c @@ -240,7 +240,15 @@ out: /* A writeback failed: mark the page as bad, and invalidate the page cache */ static void nfs_set_pageerror(struct address_space *mapping) { + struct inode *inode = mapping->host; + nfs_zap_mapping(mapping->host, mapping); + /* Force file size revalidation */ + spin_lock(&inode->i_lock); + NFS_I(inode)->cache_validity |= NFS_INO_REVAL_FORCED | + NFS_INO_REVAL_PAGECACHE | + NFS_INO_INVALID_SIZE; + spin_unlock(&inode->i_lock); } /*