From patchwork Fri May 18 16:48:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10411363 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 7E4686031B for ; Fri, 18 May 2018 16:50:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6D85F2844E for ; Fri, 18 May 2018 16:50:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6229B288BD; Fri, 18 May 2018 16:50: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=ham 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 EADBC2844E for ; Fri, 18 May 2018 16:50:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 61D8A6B0636; Fri, 18 May 2018 12:50:08 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 5CDB36B0638; Fri, 18 May 2018 12:50:08 -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 471266B0639; Fri, 18 May 2018 12:50:08 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl0-f70.google.com (mail-pl0-f70.google.com [209.85.160.70]) by kanga.kvack.org (Postfix) with ESMTP id ED05F6B0636 for ; Fri, 18 May 2018 12:50:07 -0400 (EDT) Received: by mail-pl0-f70.google.com with SMTP id 72-v6so5351575pld.19 for ; Fri, 18 May 2018 09:50:07 -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=lrgnovuxCaSzNv7fO32hsg6qhHQ+pUG9Pe7+ybA+8wuJHKhsBR8/gTS2D1IkPR/+XF MjCRWnCoL1WJ/Dp9qvFHlTRld2DJ9oiRmyYCnPgHXhoXiGE6AStvMykHHC4UagYyCQ1S qzSu6V7DsoQ5r/1h02iIFSvmw0rij9jNumkaS9uoyzV/I58YpjuXJOQC7sVkvPcGuJx5 /gV9H7RppTOCwwTwD+Z3Fwud5DD5+y09fD0xqdbAYtZMML+jmjpjc5y8Mw7kv4venhyT l1O80UYd6gB1naSw8U3t35VGCEprF2apmZdlSRh9Zcn29x2q3NA5FDmYEqSleXffBk+t rTlQ== X-Gm-Message-State: ALKqPwd2f69Nl/vArR8sbJig9PKK09RCm01ZTQCkkqLmLAeQQVM9Wr5j P+B3z5izwXfn7GLBcp66IeHarSBMdOkYmFOhf07BocS+3ADiswycFoqfus9/wFWYffZ8ZSKfdpz cT+q+97mkS8Ae+WMuxcFQpkBDG8bGl/P9Y4v+rzy4582oc8hxH510NX8fXoNWphg= X-Received: by 2002:a62:b2d0:: with SMTP id z77-v6mr10198777pfl.122.1526662207631; Fri, 18 May 2018 09:50:07 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqXT7tOJOVvr52oKSChWxRKyslakDG/AnFfzPZS0aJplWeFHTFzIxDoKe9TePyyN3qxiwLe X-Received: by 2002:a62:b2d0:: with SMTP id z77-v6mr10198739pfl.122.1526662206920; Fri, 18 May 2018 09:50:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526662206; cv=none; d=google.com; s=arc-20160816; b=tNvnLP/yfeui1LIOIVhrVsnJSa4o7R3geBQG0rmnTMaBIXpUH48kOkH4VJUAh4wGZQ rGU57pwbkLnJvBjo2UYkqTrdL68q6QyDS8zl6E6+bipTyA5v9DucR4T/bjR2VJKrmflz fuqvr3f4wIKlYeSYjFP4EnFwS+rSZkMMn2QsrOtEu+un6Vw3c/RFGvqo1ZZU72LBSFfP z/3sbWvAcYBT3M2YjIhQ0mbcLhDjFyc5DI/Ikk4lc7ouGJ/TlWmivCFziPuKe/fP/dA8 vtNx7WaJagL12pbCAKSQLa2R0xVwAno53di2791s9JLsuHPN1ciY6GM4hAezG8bWnR90 X0mA== 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=smw7CRxm0LRaVuv0sfqBqML7BVGL+JqGin+84r1liAQbUlXNOhq01VC/MPrO2aA7LG 3izSFHBPj8N1Pp/K1+8a5M8JoZ1tiqhx9zFNBB4iMDu7mqnPbtYVIC/R36b28MeSwXfz X1z2TaYaIUu+1oWJyeEw/r9YFL1uonRxkA2tZnACD8UwrnpqyyX00F5cKEJN1HLxxeda HHEoQLDFrXbTlGdPxzs8IzLbf+kjN2IiwHeBfZI6ltGkRY7JX0CLJK8C62l5+zQn1c7U uvCkftCt23MA+PqB3gaz5CzY8m5J8JCH/Mh4yR4FRA9uYHFd/vbDOIKUDSBMMCTTROTE NkQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=sOS7jZSx; spf=pass (google.com: best guess record for domain of batv+77ddf8e9b1b344f28472+5381+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+77ddf8e9b1b344f28472+5381+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 73-v6si2248930pge.55.2018.05.18.09.50.06 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 18 May 2018 09:50:06 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of batv+77ddf8e9b1b344f28472+5381+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=sOS7jZSx; spf=pass (google.com: best guess record for domain of batv+77ddf8e9b1b344f28472+5381+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+77ddf8e9b1b344f28472+5381+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=sOS7jZSx8tzbS5oZTPZzQUjTm LBF4/Y2N7e2e27ppStfvsWH7HV/4bQLkbggG6PY1JRHSnUTD5PGOj1OlSwtP9oKtoa48YVmfkv/pC HbPDuMOGAAD/Ls01GI2ZDz8M/J8HgpJssFNxl6arth2wvQ7R2/0eD3cFuRJONukPwzzzaFn74ulvC eT6OAb1GYS0iZ+dmyTWLOhz3Oam0DnYz+2j8w8n4Ng6/s897M7R2ntu31FJCumWvDnpdgIo+YYnri tcXf+Dt5t+zucdPalSPKc7O4xRHP41c1SV+X+OZyWKx+kLNR+TU9oPn3rYWya3hwo0gIKq84U1d6P f5VDmp9RA==; Received: from 80-109-164-210.cable.dynamic.surfer.at ([80.109.164.210] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1fJiZx-0007Pb-K3; Fri, 18 May 2018 16:50:06 +0000 From: Christoph Hellwig To: linux-xfs@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 31/34] xfs: remove xfs_start_page_writeback Date: Fri, 18 May 2018 18:48:27 +0200 Message-Id: <20180518164830.1552-32-hch@lst.de> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180518164830.1552-1-hch@lst.de> References: <20180518164830.1552-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); }