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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1FA53C4332F for ; Fri, 27 May 2022 15:50:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 663B08D0022; Fri, 27 May 2022 11:50:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 506368D0027; Fri, 27 May 2022 11:50:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 28C688D0021; Fri, 27 May 2022 11:50:44 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 1558E8D001E for ; Fri, 27 May 2022 11:50:44 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id C7A78A65 for ; Fri, 27 May 2022 15:50:43 +0000 (UTC) X-FDA: 79511960766.15.0811355 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf02.hostedemail.com (Postfix) with ESMTP id AB6DA8004F for ; Fri, 27 May 2022 15:50:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=9lB4vg82X1aog+28GWsmbeVPWSeO4zm3Yw9Wz/19ZOE=; b=ag3i1XA7jzfjKuUZ8shp/7sg1h wLQ6vjDq9I+L9K7YxSACq06x6pSP2JXcl9ZdntwywcPK7HZFThj8mZLNwg06Y4b2OPyQUfV9P6pIB aKN/jkdId0/BHiqh05UlkNtdUiQYLN+OU7oSh7Qqy6jJCu4FEFWwOzC5gmmeoiPWclnweev/6LrTc CA64sccsLFtaWGq0C8Z32MBa322W4YmNIxDqNlBX0Hbx6f0RIArhxhHloKwxQiEJ+PUzzwCCmu3Y6 HbDJ+PRTQPETKaD+YZ0WzgTgZC7pGpKoBHJPVkSeR+CL3ut6C/+ISoMMo2GAD2PyhZ8bVOUL712jO KOhxNxxw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1nucEb-002CXX-U1; Fri, 27 May 2022 15:50:41 +0000 From: "Matthew Wilcox (Oracle)" To: linux-fsdevel@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org Subject: [PATCH 19/24] nfs: Leave pages in the pagecache if readpage failed Date: Fri, 27 May 2022 16:50:31 +0100 Message-Id: <20220527155036.524743-20-willy@infradead.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220527155036.524743-1-willy@infradead.org> References: <20220527155036.524743-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: f894djjz8tjofrry8n1r7et85wpn1jx8 X-Rspam-User: Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=ag3i1XA7; spf=none (imf02.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: AB6DA8004F X-HE-Tag: 1653666639-538071 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: The pagecache handles readpage failing by itself; it doesn't want filesystems to remove pages from under it. Signed-off-by: Matthew Wilcox (Oracle) --- fs/nfs/read.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/fs/nfs/read.c b/fs/nfs/read.c index 5a9b043662e9..8ae2c8d1219d 100644 --- a/fs/nfs/read.c +++ b/fs/nfs/read.c @@ -120,12 +120,8 @@ static void nfs_readpage_release(struct nfs_page *req, int error) if (nfs_error_is_fatal_on_server(error) && error != -ETIMEDOUT) SetPageError(page); if (nfs_page_group_sync_on_bit(req, PG_UNLOCKPAGE)) { - struct address_space *mapping = page_file_mapping(page); - if (PageUptodate(page)) nfs_fscache_write_page(inode, page); - else if (!PageError(page) && !PagePrivate(page)) - generic_error_remove_page(mapping, page); unlock_page(page); } nfs_release_request(req); -- 2.34.1