From patchwork Wed May 30 10:00:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10438293 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 9AD9F601E9 for ; Wed, 30 May 2018 10:02:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8B865288EF for ; Wed, 30 May 2018 10:02:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 809A9288F3; Wed, 30 May 2018 10:02:08 +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 252D3288EF for ; Wed, 30 May 2018 10:02:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CDAF06B028E; Wed, 30 May 2018 06:01:23 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id CB1946B028F; Wed, 30 May 2018 06:01:23 -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 B7ECD6B0290; Wed, 30 May 2018 06:01:23 -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 7904E6B028E for ; Wed, 30 May 2018 06:01:23 -0400 (EDT) Received: by mail-pl0-f69.google.com with SMTP id g6-v6so11107316plq.9 for ; Wed, 30 May 2018 03:01:23 -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=RzxFbhJ+sqAjbKmFfKLeukDWarnL5RAW87mvVTh0dQ4=; b=g2atGTglK6kBiiERvIbbi1Qjbsvydp/yVd3VxbxZxoAHr0A4TR60XA3pj5g293YwYS nyGhwuGbcO5TAEh2HBvdMiYlLkJO35nqT5ABQ6gS0mIprfuYunXZsQDQ9vpX/hybyfWD 47Z+o3UblrRv273+pyJetPJfxx/JiO6b9h2VULSZDwCPEy5FSdrzh/TZf9tU2L5sijq3 sUv/BMqjmi9g/uaQve5L8ypp2EoCNoJ8W1wUjSfRVk78vk9YJkwi82dSFsdxNU4a5lBH n2IQKMW+WoNGjs6fJOZBcXsI7eCVxRDzVb6ALyH9LcRvZbH2ZgGCM3jzsUJrnXZfNrob hAFw== X-Gm-Message-State: ALKqPwevY3B/9w9c8NsPxWAT/F74dloVv7gGvT/ofN1RaCsxNDx3vTqf T9WPJ7KJIJouKyk3NCgquFdqa+QCiVVVZc70oapsgBt2p0MU81czRBGq9mRUmsKk7DZzWXm/hZL SVG7TG8U5UXt5T+KW0CwvTkT93Hfq/4bas7/nj89VJ2leiSPzQ7gq3eVAMHI1w/s= X-Received: by 2002:a63:78c3:: with SMTP id t186-v6mr1672326pgc.93.1527674483182; Wed, 30 May 2018 03:01:23 -0700 (PDT) X-Google-Smtp-Source: ADUXVKK05TgQOKpqT6BHAmJ0Yl54NHxMcsk0EcbZm3g4XeQ1Dlsj7awis4G5VKRhYZU233US6dL2 X-Received: by 2002:a63:78c3:: with SMTP id t186-v6mr1672275pgc.93.1527674482460; Wed, 30 May 2018 03:01:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527674482; cv=none; d=google.com; s=arc-20160816; b=uA8p/EpuprjWm28g1Y1r2Caa2GgC99lRVrBsnNja2ZhNDed0ZenmGxhFvlU+RB5DnV RoMMJzb6AwHvnaKdaQsPqQchC0Bmjb/HsKplkADx+9kc49LFgzDxQHlOBtE4U/UseqfS d8Y2riOY7fRWRyqKm1HL4XCr8xeXEUyp/87dWfSYp8+hxWuVhlwxpIi479U5C+2Rlsct GujTzI47eyKMJI248mOSuCtTeUW7jNdkMrQ9jJZZHhtjOB6rIdczCpYwxeqVEycrLtx0 Qj0U5N7OtAs48qs3P779lFMQo78G7IYBnFcpN1pxct/f6nDgroLmCFeLRI0PdXzSsuW0 CRrA== 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=RzxFbhJ+sqAjbKmFfKLeukDWarnL5RAW87mvVTh0dQ4=; b=wNePg+/IHhvH8Yzh+hoRWIuWmpdY4xhlnyAfgu7uQSjL5WTzFCs3D/YqnCKqIqe/HX +7S1LiqelJXr7U5/N6s2Mc2Qh97w3WNHX4bnWClahbsNo4udl1Mt3n4Mfe1APIs8WCoD BoyqTYi26jVabX7RU3+8Qq1zfc8WWVu0LDDtulhEGa6ck1qzk1tTbSfRmInVB4bUmQ5A JHGPrwDCaXVOGw65etuQDjfmJN0RVGFDcrAnO2r12rlHZGih+tOeRPxuDKvVZ/7rka7R fWGVcV60TBFOOS82XapDGf2js+9HZqbm6lSEwEfrH0MoYV88mnCgEtVRXSihs4nO0Ehu V0Kg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=ZMkmAp/7; spf=pass (google.com: best guess record for domain of batv+1f4557cc97fec8e307c5+5393+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+1f4557cc97fec8e307c5+5393+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 w12-v6si33832096pld.46.2018.05.30.03.01.22 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 May 2018 03:01:22 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of batv+1f4557cc97fec8e307c5+5393+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=ZMkmAp/7; spf=pass (google.com: best guess record for domain of batv+1f4557cc97fec8e307c5+5393+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+1f4557cc97fec8e307c5+5393+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=RzxFbhJ+sqAjbKmFfKLeukDWarnL5RAW87mvVTh0dQ4=; b=ZMkmAp/7CysX9qW2ZCS0mJjgT GTbnQr8LaAqvwKalvCLYRdemB/fvII5jDUM3YJAjKnWYXz4jHP0Pd2GLXkNRBd7g8PSWO2cwSCDNT TEEv5ia5knmcIeg69e39svlzlzb0dqaVjAUEVdZ7oEFk4WLLdd8f9eRBYlZFsh7zKZV9inHU5kbZ0 8Ar4bmyVXvDBJVkLJOrg4OUJCKojKoVJJS/ekBkXm79CsF860qUCSJ8xvDEOmwiy3SKjvhLeNajkt OXo6SHoqSQxitjtpkmMwyc3gPN+/+cjwdmQUfB2sScaGMul8Xr9Nn1IlB0qrMIN6kg454rT3ZLmp1 8+0eH9IbA==; Received: from 213-225-38-123.nat.highway.a1.net ([213.225.38.123] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1fNxuz-000069-Ao; Wed, 30 May 2018 10:01:21 +0000 From: Christoph Hellwig To: linux-xfs@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 15/18] xfs: remove xfs_start_page_writeback Date: Wed, 30 May 2018 12:00:10 +0200 Message-Id: <20180530100013.31358-16-hch@lst.de> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180530100013.31358-1-hch@lst.de> References: <20180530100013.31358-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 Reviewed-by: Darrick J. Wong Reviewed-by: Brian Foster --- 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 025f2acac100..38021023131e 100644 --- a/fs/xfs/xfs_aops.c +++ b/fs/xfs/xfs_aops.c @@ -495,30 +495,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 @@ -877,6 +853,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 @@ -895,7 +874,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 @@ -920,7 +913,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); }