From patchwork Wed May 23 14:43:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10421659 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 48DD260327 for ; Wed, 23 May 2018 14:46:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 39455289B1 for ; Wed, 23 May 2018 14:46:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2AE1028B00; Wed, 23 May 2018 14:46:39 +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=-2.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8A8C5289B1 for ; Wed, 23 May 2018 14:46:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0FAE46B029A; Wed, 23 May 2018 10:45:41 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 081AD6B029B; Wed, 23 May 2018 10:45:41 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E40256B029C; Wed, 23 May 2018 10:45:40 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl0-f69.google.com (mail-pl0-f69.google.com [209.85.160.69]) by kanga.kvack.org (Postfix) with ESMTP id 9B9DA6B029A for ; Wed, 23 May 2018 10:45:40 -0400 (EDT) Received: by mail-pl0-f69.google.com with SMTP id bd7-v6so14344850plb.20 for ; Wed, 23 May 2018 07:45:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references; bh=bcba655wbtDa8GWbEYDXYD4ha6mli4TdyrDSPs7BLTs=; b=lhHQ1L26wz4E/+BDR/WND6tqHlX1JOZEfxJqTTvGXbqzKSbLkQ370mJabgQAMjlhxB lrxSX0Xml3XW79j8Yf9gmtYE8WpU1vwGiQ0WP+/JRt4Oq3l0vU5xmOQbKJWgAZRagSmL 4l3mpvhgrJKgjMejow1RIB3EK/ZTvz0q/oCO2dtVsQzrgzBwGuu9AWhX5QCMBmMgtD2A YJxIK4xuDOYaRa0eU3eUORY8SJSIL1lNFQXwV/SFtIeerd6Rt5+e6tIinIY0ENTemtrN 2ydZpgbM22wlX6wapjb+6NY0fDRRvTljilIYTppMJ0way2UK4gsMq4Hwlek2GkdCnqwY EOLQ== X-Gm-Message-State: ALKqPwcm+Ep2TA6TmHEEt3reqxVV3iIx/1cdJyC8hTYzuXp0q5GyChVg wxC44+Of/GEFzMYAA7E13oZyWY0DhpfLZ0P2Eo+Pu++ti8nB5kqxHpdrO7IK5pGjvf3HE1MS0MI zzFoax1hGk9xb1D3zyXY/1wnlFHfS24tIW75I07z/t796WesVXjpa4YY6dug4Zs8= X-Received: by 2002:a63:203:: with SMTP id 3-v6mr2590267pgc.133.1527086740300; Wed, 23 May 2018 07:45:40 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrsoMYiYsyS8HTf+70gUAvHNMT5wgV8SA+T76VqBZPg8YPW9EWzA15LyKscNlln+9R2H0BI X-Received: by 2002:a63:203:: with SMTP id 3-v6mr2590232pgc.133.1527086739362; Wed, 23 May 2018 07:45:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527086739; cv=none; d=google.com; s=arc-20160816; b=kHY1L/dwbJ9hBgqAhMyoQTD4HxKy4WsZF5QDX6FVfR/Q9Qc7TJNfXqmGRrU0XikAxr FC8wZRRWlgv+ip3iPoBZOWA2sTdBepESzz1QkdysBdfHuiwUuVCRz/tn1lz4GaUVwbNl KchullsafqFcmuBuKNrGGVbIgAzj3to28CQ/5smyWhF7+TFFcZD2UX1MGxQaKeRvPsFf CHkhv/9tpBAbJw5LHkCWiGTH78BJnjHZLPRh1R0/KxEp1k+NqxEH6yTU8ODUxLzPeBmQ 7cYW4d+r9XzW9xHCuzSPZ3UMIfYe2z/r+GNxBnL3w2+ESKeMOobuO1JYRhyrLTGj95bu XmTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=bcba655wbtDa8GWbEYDXYD4ha6mli4TdyrDSPs7BLTs=; b=vQyH4beT2ytDsE69+QeadfjmsPy0YtJP79solW56WpPXz0l7WdWlBWI9KPTOReaq7/ xS6AVT0K6KWjNkL9aLUcUXit8l8ZBXiyQ/bQjA/qgqgqybWuYQBAr6xJJ8cN5Un2LOMj XxMqdpch/TsRJpZsgplogGWgBzje8AjHN8aUiiO89wGnQ2w/FIdlSvJgi0Yr97wZXK/J RHdN6fXyyTip2dbr0N7VZ4IF88ul0qSAKMSPhqbaCVNNZLoDIwaOVuCe73AaKStgXqvq 5qC6vkz5unU4cIhtHSFSxIZoOXcENGwRQbCRoEh7LnMzrKGoidnictgtV6dkpdph5Jjr zZMg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=moJzE5SU; spf=pass (google.com: best guess record for domain of batv+df5a2477ff0fa86e9985+5386+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+df5a2477ff0fa86e9985+5386+infradead.org+hch@bombadil.srs.infradead.org Received: from bombadil.infradead.org (bombadil.infradead.org. [2607:7c80:54:e::133]) by mx.google.com with ESMTPS id f21-v6si14806921pgv.382.2018.05.23.07.45.39 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 23 May 2018 07:45:39 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of batv+df5a2477ff0fa86e9985+5386+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) client-ip=2607:7c80:54:e::133; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=moJzE5SU; spf=pass (google.com: best guess record for domain of batv+df5a2477ff0fa86e9985+5386+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+df5a2477ff0fa86e9985+5386+infradead.org+hch@bombadil.srs.infradead.org 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=bcba655wbtDa8GWbEYDXYD4ha6mli4TdyrDSPs7BLTs=; b=moJzE5SUASqvQU+jzzY7IaP8f BHMHhLq4ne2KZFRT3NOZYSojFG8EurvQbjOy8cS7ZIiL5tZWZnhcISIq0PUmRzpLlFNP+Kde5/LZc /srGSryhJau1tOTuDwnLJh+gqr22yXi2PNRf+lR313f6K1XU7D6+KdvvbPivK6CBZYDIPSNnNsYvC Ztlgp+Yf4KWH5aC+6QpFN1NEN6veZD5qL91JBu9ukulwPWBmvHhy8s51x1p/91JRH+O0DCaBC++sd mwCl8FVuLK/8QwFsEp0ZFFXnuxZ/tn7ow13tWKBlqPmxclMK3sAnyJjc3TMduJGvcfT0BKzL+rIKD zyFqDCQeA==; 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 1fLV1E-0001yw-W6; Wed, 23 May 2018 14:45:37 +0000 From: Christoph Hellwig To: linux-xfs@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 31/34] xfs: remove xfs_start_page_writeback Date: Wed, 23 May 2018 16:43:54 +0200 Message-Id: <20180523144357.18985-32-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 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: X-Virus-Scanned: ClamAV using ClamSMTP This helper only has two callers, one of them with a constant error argument. Remove it to make pending changes to the code a little easier. Signed-off-by: Christoph Hellwig --- fs/xfs/xfs_aops.c | 47 +++++++++++++++++++++-------------------------- 1 file changed, 21 insertions(+), 26 deletions(-) diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c index 951b329abb23..dd92d99df51f 100644 --- a/fs/xfs/xfs_aops.c +++ b/fs/xfs/xfs_aops.c @@ -505,30 +505,6 @@ xfs_imap_valid( offset < imap->br_startoff + imap->br_blockcount; } -STATIC void -xfs_start_page_writeback( - struct page *page, - int clear_dirty) -{ - ASSERT(PageLocked(page)); - ASSERT(!PageWriteback(page)); - - /* - * if the page was not fully cleaned, we need to ensure that the higher - * layers come back to it correctly. That means we need to keep the page - * dirty, and for WB_SYNC_ALL writeback we need to ensure the - * PAGECACHE_TAG_TOWRITE index mark is not removed so another attempt to - * write this page in this writeback sweep will be made. - */ - if (clear_dirty) { - clear_page_dirty_for_io(page); - set_page_writeback(page); - } else - set_page_writeback_keepwrite(page); - - unlock_page(page); -} - /* * Submit the bio for an ioend. We are passed an ioend with a bio attached to * it, and we submit that bio. The ioend may be used for multiple bio @@ -887,6 +863,9 @@ xfs_writepage_map( ASSERT(wpc->ioend || list_empty(&submit_list)); out: + ASSERT(PageLocked(page)); + ASSERT(!PageWriteback(page)); + /* * On error, we have to fail the ioend here because we have locked * buffers in the ioend. If we don't do this, we'll deadlock @@ -905,7 +884,21 @@ xfs_writepage_map( * treated correctly on error. */ if (count) { - xfs_start_page_writeback(page, !error); + /* + * If the page was not fully cleaned, we need to ensure that the + * higher layers come back to it correctly. That means we need + * to keep the page dirty, and for WB_SYNC_ALL writeback we need + * to ensure the PAGECACHE_TAG_TOWRITE index mark is not removed + * so another attempt to write this page in this writeback sweep + * will be made. + */ + if (error) { + set_page_writeback_keepwrite(page); + } else { + clear_page_dirty_for_io(page); + set_page_writeback(page); + } + unlock_page(page); /* * Preserve the original error if there was one, otherwise catch @@ -930,7 +923,9 @@ xfs_writepage_map( * race with a partial page truncate on a sub-page block sized * filesystem. In that case we need to mark the page clean. */ - xfs_start_page_writeback(page, 1); + clear_page_dirty_for_io(page); + set_page_writeback(page); + unlock_page(page); end_page_writeback(page); }