From patchwork Wed May 9 07:48:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10388513 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 A2C7060170 for ; Wed, 9 May 2018 07:50:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9684B28E05 for ; Wed, 9 May 2018 07:50:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8A80828E68; Wed, 9 May 2018 07:50:40 +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 0698028E05 for ; Wed, 9 May 2018 07:50:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F07736B0371; Wed, 9 May 2018 03:50:26 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id EB6AF6B0375; Wed, 9 May 2018 03:50:26 -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 DAAFC6B0376; Wed, 9 May 2018 03:50:26 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg0-f71.google.com (mail-pg0-f71.google.com [74.125.83.71]) by kanga.kvack.org (Postfix) with ESMTP id 877F46B0371 for ; Wed, 9 May 2018 03:50:26 -0400 (EDT) Received: by mail-pg0-f71.google.com with SMTP id j18-v6so19291411pgv.18 for ; Wed, 09 May 2018 00:50:26 -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=v4aa+YPuUCgNSmjI55XagpYGzoU6EqkVoxPrhgTWz+U=; b=JIl2JH3O5OCZovbLWl8JmlXUE61KnVr8bn4v9k+G891PSYzfFlXdCs9WRs+H93/cXV Tqf9ABGtIRNh9U3rxzTw6C7fAnVO7zhWw01Z2SiTKgGOZT2rpRSABYAxsViNod04bi0h kC5PAZ7zDJLPUmagsZPvyVqpa11394dtZ2jwRziec50/+08DsEs580LUlfhSktrDbJsb Up30pSFMwigsDjLH6Teqfyg8mqUoN59WZesflbt0Cv2xkaZGOQicdgnD8WbTaKFU+gDX gH0fByTQ2EEJ5cOFJDvX098LShs2BFAjNyJ3jBuc/+aT+v8CmyCgKcmGbzoAPbpjfpoY YvXQ== X-Gm-Message-State: ALQs6tCK4Hc5eHGgix78MLM5fzJjNVCTDlZq4qW3OKkJYNCzPs6w5nVW 4hWUObsHBKiZHU0pyah77ljkLu2HFHSRLFQ7wTL9era/ULh5Hb/q5WHkewVJFtWMbjbkKDGbdp0 AnUXYI2opm1zTgkspIbKYfYvnHbaqp8RUHf0MDu1JEGAvetVHrzlAoj9ly/YQVjc= X-Received: by 2002:a17:902:1e2:: with SMTP id b89-v6mr45437019plb.389.1525852226251; Wed, 09 May 2018 00:50:26 -0700 (PDT) X-Google-Smtp-Source: AB8JxZp9iZjTfqt4XZ6Cc73SsG7NjxQqVBMF3aRjKCfZPEzNo2SxzCkupGr/fUjJZy53WLedB0XP X-Received: by 2002:a17:902:1e2:: with SMTP id b89-v6mr45436982plb.389.1525852225460; Wed, 09 May 2018 00:50:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525852225; cv=none; d=google.com; s=arc-20160816; b=j2IPIWwWdAq5157JdV0e2KRzFy537cwd/vUE1jW2PUh2Eq9wl69nfWfchhAoHIistK EIkgM8yxFiXB/OMo6KkJBlhgtucmBqpv9sbKZwNuOERRqJpVjnvGaQczpn82pMopWWgj STsSeI74qtCivOzvjz50J0JgyXlSy2EmXKeA3u76eAPDP56IAXgBpgZvmKQVY0Klc0m4 8I4O/8DJ+OJ2Nx7grnr2ekxFr/QxULnOvWSzAQtmk/Y2kfZHqYEHIbyNZuUab0UJt1zO t2BYbbBabX59jTqtckEoMCTKFQET//wKsJxmAD0SKOAtdh6dc25ebaUYLkYss07TpJT6 /jbg== 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=v4aa+YPuUCgNSmjI55XagpYGzoU6EqkVoxPrhgTWz+U=; b=yRq9AMScDCKmX62dedJCX2dj2eQx7vxTwYoXZhluN7tPNIoGwzb01bcOWQBAZsxsUE BhG45Qppw0fQ8yjezamXK3DMGl/prMn2jghTdacd/b4iN9CR01CFirNFd3eMlPfPEd/Y LdfmUv6AKWmWOelwRI7emn2TkL6Yd0qibxP24N21mBnnNmERNk5/zGnHP1pnDtl1gvRx IjU8DABIqQ95sEZ9sAVemtIhKeV8eWNLbB9mKuNZFmnwbfbc/i1fk95NVbt6nxcMexSF fStzRCcOGZfVGPGkT1X2/4UzBnlvz4SAy7tbL82a7UaUliXsBaXUs5PvsIdy0NtlnWQh SGlw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=qwUCSgRG; spf=pass (google.com: best guess record for domain of batv+e0efdd19ce80d487e3da+5372+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+e0efdd19ce80d487e3da+5372+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 s21-v6si12327527plr.143.2018.05.09.00.50.25 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 May 2018 00:50:25 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of batv+e0efdd19ce80d487e3da+5372+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=qwUCSgRG; spf=pass (google.com: best guess record for domain of batv+e0efdd19ce80d487e3da+5372+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+e0efdd19ce80d487e3da+5372+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=v4aa+YPuUCgNSmjI55XagpYGzoU6EqkVoxPrhgTWz+U=; b=qwUCSgRGwvdPzwtu8t1mcKsWQ c3WzzknBbIAVLfVqbIvf2uwjjwis7f/CEngshXDcSbTCJ8yvyZUBDUMV/6Vk3ZHzlT7KctGh9eB3r eslyD+lkTfjuF8BytErFoM4b0tNr0NVB5Q02PNqFCwsMjqcev2U6Po7BVWnH2LmWARBmeRhrq4j6+ 9yNjAf9657TeiTVz2I79gPuvrqq9TIC3xeums5kb0iAfyxkZWT1fPday/ckL5zrzyc2Ct2qd1Gc5N VdPUC6eXFQv/BOLNSY+fAT7XUno1/6IsdZj0FaH1xoy4bQ0QWbMEsxGTe+y/vINAmUCfD49rUdU7z TAZdVlgWg==; Received: from 213-225-15-246.nat.highway.a1.net ([213.225.15.246] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1fGJre-0002PL-E4; Wed, 09 May 2018 07:50:19 +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 27/33] xfs: remove xfs_start_page_writeback Date: Wed, 9 May 2018 09:48:24 +0200 Message-Id: <20180509074830.16196-28-hch@lst.de> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180509074830.16196-1-hch@lst.de> References: <20180509074830.16196-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 879599f723b6..6b39792270aa 100644 --- a/fs/xfs/xfs_aops.c +++ b/fs/xfs/xfs_aops.c @@ -521,30 +521,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 @@ -910,6 +886,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 @@ -928,7 +907,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 @@ -953,7 +946,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); }