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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 E1ACEC3B189 for ; Thu, 13 Feb 2020 15:47:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AE98220661 for ; Thu, 13 Feb 2020 15:47:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581608832; bh=CuVfiS2S9a2bwNenn2jhACMneXOOC1/b5Hy9foAEjiY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=L1xpQrzZg/Kkd8d9djToNfwBoD1TX/N1ouGN3Xr+MDXJXhSk8eljCxc9IBK8bBBrP Jh78FHJXp2UjfgZhS+7yC4SsiEQRtKrhiwUhK318f3utrg6mcv6AHFUq6GrhV5OsF2 2x3ILfbnpX0utnArk7yOC0+nl22blX8yyKC6cZhA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387515AbgBMPrL (ORCPT ); Thu, 13 Feb 2020 10:47:11 -0500 Received: from mail.kernel.org ([198.145.29.99]:49082 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387680AbgBMP1J (ORCPT ); Thu, 13 Feb 2020 10:27:09 -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 0A96A24670; Thu, 13 Feb 2020 15:27:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581607629; bh=CuVfiS2S9a2bwNenn2jhACMneXOOC1/b5Hy9foAEjiY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zCgRLh70xpMMBRl5nAzYg/eIjYrrbjnOcaAF6W6ksVkBweIxuXLUjjSG1lvB+wiip cmiMB19ZHb8F/TqyUL8ivRy3SsvVj7avoZ4hElvoIg7RCz4We6DnnwM+LAWP/KQt56 HpiKwvwfsPFE5n5vkq/X7RrrBir31LqzMAVNnIm8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Trond Myklebust , Anna Schumaker Subject: [PATCH 5.4 28/96] NFS: Revalidate the file size on a fatal write error Date: Thu, 13 Feb 2020 07:20:35 -0800 Message-Id: <20200213151849.887788287@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200213151839.156309910@linuxfoundation.org> References: <20200213151839.156309910@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 @@ -243,7 +243,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); } static void nfs_mapping_set_error(struct page *page, int error)