From patchwork Wed May 23 14:43:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10421633 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9F5D560327 for ; Wed, 23 May 2018 14:45:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8F31228733 for ; Wed, 23 May 2018 14:45:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 84373288B2; Wed, 23 May 2018 14:45:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3B21A28733 for ; Wed, 23 May 2018 14:45:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933186AbeEWOps (ORCPT ); Wed, 23 May 2018 10:45:48 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:49538 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933236AbeEWOpp (ORCPT ); Wed, 23 May 2018 10:45:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=JW7ZWeh7Dx9ZhJ7wi1sm/SGCW78S6fO5bWHg9jx+qxo=; b=Ylj2t0dF6VJpDiSne4v+dngnn 3bS5Im3OdqBPCv0oxNGv8M589b/rpJuekkcOeKhYCXy9RNmKjxzZ+8JNl3DNpH5ZCdw89rhQT/MIu 2MMYMtG+ib0YzXxcUNIftrtFkWMhgP9lVd1lOJvsj0CUteYnUg/YS95TqOSvkqbuwxVNF2GNZEwxe KPfpbMRmgTvpzeLblXdqH9bIEdHMrPAbCoUL6dNJHK5OHxBgjymuVxvQXSAY+w+71PhR7QrQ4GhaZ TiHsxGu523ZnWtMjyODiP7knyFZG5k0qPQq+5QJwnS8q6mBcc+LWlIWsi6wB1RUm2Givir6BHa+rm n16Tosw0w==; Received: from 089144199016.atnat0008.highway.a1.net ([89.144.199.16] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1fLV1M-0002Hi-1J; Wed, 23 May 2018 14:45:44 +0000 From: Christoph Hellwig To: linux-xfs@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 33/34] xfs: do not set the page uptodate in xfs_writepage_map Date: Wed, 23 May 2018 16:43:56 +0200 Message-Id: <20180523144357.18985-34-hch@lst.de> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180523144357.18985-1-hch@lst.de> References: <20180523144357.18985-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We already track the page uptodate status based on the buffer uptodate status, which is updated whenever reading or zeroing blocks. This code has been there since commit a ptool commit in 2002, which claims to: "merge" the 2.4 fsx fix for block size < page size to 2.5. This needed major changes to actually fit. and isn't present in other writepage implementations. Signed-off-by: Christoph Hellwig --- fs/xfs/xfs_aops.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c index a4e53e0a57c2..492f4a4b1deb 100644 --- a/fs/xfs/xfs_aops.c +++ b/fs/xfs/xfs_aops.c @@ -796,7 +796,6 @@ xfs_writepage_map( ssize_t len = i_blocksize(inode); int error = 0; int count = 0; - bool uptodate = true; loff_t file_offset; /* file offset of page */ unsigned poffset; /* offset into page */ @@ -823,7 +822,6 @@ xfs_writepage_map( if (!buffer_uptodate(bh)) { if (PageUptodate(page)) ASSERT(buffer_mapped(bh)); - uptodate = false; continue; } @@ -857,9 +855,6 @@ xfs_writepage_map( count++; } - if (uptodate && poffset == PAGE_SIZE) - SetPageUptodate(page); - ASSERT(wpc->ioend || list_empty(&submit_list)); out: