From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4B165EB64DC for ; Mon, 26 Jun 2023 17:35:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 740A18D000B; Mon, 26 Jun 2023 13:35:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6F0668D0006; Mon, 26 Jun 2023 13:35:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 42FC08D000B; Mon, 26 Jun 2023 13:35:37 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 290CA8D0006 for ; Mon, 26 Jun 2023 13:35:37 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id EC212140805 for ; Mon, 26 Jun 2023 17:35:36 +0000 (UTC) X-FDA: 80945601072.10.3C42ADA Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf14.hostedemail.com (Postfix) with ESMTP id 5669810000C for ; Mon, 26 Jun 2023 17:35:35 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=EnXvWYXx; spf=none (imf14.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1687800935; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=ImqynQi+azeOKkPbJPWnsB36hvgJ5MojMLeTL2XpTIs=; b=B6iHX37fgfvxNIepaTeNG6F5If8G8a2XM4Yd1248wFKA8EwpbV4cscv/Nvyqb4Q5gNwQG9 ATzAO3PNoVSY9yOf1nVagmLtDULz4Sjq1ekeotg8iV4K0fHetW/PlQVtGHPWfkFdDX4x8v m9EK9xs7SPKmrDIhmWjm4lc0gMppwkU= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=EnXvWYXx; spf=none (imf14.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687800935; a=rsa-sha256; cv=none; b=cJMzE+PGBADY47AV8SUbkWjbhv4CA1Kqzo5EKhmruKV7BMV03LvbsbMnzfCUAmISYbHN41 8aPeBBUsns4Qq2YaiATo7cmFOkIA9t0RQOcsl791AyVx+ZN7cl/dG03ThbTuJUjzIjAsYT gruWnMYtQZtOG3Rk3EzyJJkk2kRAU/g= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=ImqynQi+azeOKkPbJPWnsB36hvgJ5MojMLeTL2XpTIs=; b=EnXvWYXx+3E+jBbF7Z3B+1Gi/T yYgl8ytz+fZoD1bsHwC8cXajllUXh279ulAn62xGFuLds1WNXkGTXCQQEyIO2oWdLPtMZma2d/AMg 5Su9uB7fPivq5SeGFfjxhRCguvBEtuQ+YT74zwhANJ5gvelakTfU9l8U8T0yUP1L00nf5upXTXCP+ Tl1v60WsSro8t+8iDng1kThDvglAI8CetB6z50p5gO6KiKgThZkNJZBBkCDUuV1iH9gr8bU4TyNAL wyAv9pc62eib4kBG2gca6eQc6JVqDCIx0YaYqXUQ3JQrqmBSOGcIkls/+Yr7M2SL3Upaqt+O1iEA3 6Vw5OxJw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1qDq7Y-001vVM-AH; Mon, 26 Jun 2023 17:35:24 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Jan Kara , David Howells Subject: [PATCH 12/12] writeback: Remove a use of write_cache_pages() from do_writepages() Date: Mon, 26 Jun 2023 18:35:21 +0100 Message-Id: <20230626173521.459345-13-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230626173521.459345-1-willy@infradead.org> References: <20230626173521.459345-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 5669810000C X-Rspam-User: X-Stat-Signature: 6fx3qrfgzd5s1ur7wne94b4dpbaqdhyn X-Rspamd-Server: rspam01 X-HE-Tag: 1687800935-101824 X-HE-Meta: U2FsdGVkX18raMkBKSHCg81Jfkoy7/ZbfzFguMrIYWRJbC44zGbsbMsk/8N7phhj/lKB+RL+F0k1UixV4j/J+PmQCDT/4Z1v91tWBIqrXzCI/oNtRDshMX7YnEZR69O0J5hTeM8UfTpC0L7DxqP2fxy+mOYWI93Oyc3peWX91SPn71JUrWu6W5+w/H+/k5gGld4UICbZGilnnM8OZy6pwiPl++iQ1pPmOABYIwtZkDTe/UInuSTGVVQOEoRXCcphMqQIKlvX2JmGiFnyHQwOt0EcU6ZHj2Nl3v56lgB6coiBZn1TsYLDEhQT5nLoHEDg8LJfNj4apThysZYctzM4fMEijHHLmUsG635I2MEfQ/bn8iJpu7DjSnQ/XciqorZPUQi11C+yzWdKUYg4FmL/e6mcXusVR8ECeTXEvN67qrwwhcEXosq4zGlmn+8fIvA4L992X5lImitMHBnh1fcHPvdHvFWkkpeRjAyTplEu4/jkdxEXoGXhvBNyXlQg7TJTlod8yAqlIhyd7t0Eg3hOwiPLLGlO0l039kMAKKCz1BqqiwDbX+4mFUPIPvkkTQ5XkLrpyj9x0CZG9qNk+20Y7AtC8LBRQ3k0FYs5IWWre6fNFbwS6wnMzpcbK7zOY73vjvVOoxohns+uw6rKueZlBy30vGYUN1Sul3F9RweiXe3x3vzdNKs/mqrm4P5tWdV69DhSf+cows7nLzg5dhYv/sU1RAv0EwCDJVNu9Y4Rz5aFoqMqnXTR+0LS9qd9hUFZ1SLSKuO/qXwEt0FbsCX6Oym2d1agAy468/okan6OOXqvQ/bzTcCZgTssk9c5TbTyzOZ4+OTvw+3Ti+p+DtJWROTt9BLRttpVEN6Hm0bqEU6QTZFDUwCuQE21gTnWEYUV+PUivzDewcG7F2utxZAAQ8NTEz25c9T+jyitP0kPW+wnDxz8FpY49iA8TxrnMVtbGhszRxxD6znQbisFdDY sWMqLgYJ C7Zhf/v8ndGsvb5BqGiqJw0HuADGR0u3NWc+NQKPJw8V9FUMWsW7rqip0YDu2XRAfHXnB/bJ8xyLV3PF+Xu9LemTLqNtHfYzia2b3ZuMOwm6qq/9EzASlNdYdtWNr6M3NqCdgrQcR50otpxEMirBMQS3+pZLVfEJkcdA0vDfSAA1pefgfPN8wcWszxb4I4om59NFtSieGIPI69PvTlQeDlHhKR54MueG66jsL 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: Use the new for_each_writeback_folio() directly instead of indirecting through a callback. Signed-off-by: Matthew Wilcox (Oracle) --- mm/page-writeback.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/mm/page-writeback.c b/mm/page-writeback.c index 245d6318dfb2..55832679af21 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -2557,13 +2557,21 @@ int write_cache_pages(struct address_space *mapping, } EXPORT_SYMBOL(write_cache_pages); -static int writepage_cb(struct folio *folio, struct writeback_control *wbc, - void *data) +static int writeback_use_writepage(struct address_space *mapping, + struct writeback_control *wbc) { - struct address_space *mapping = data; - int ret = mapping->a_ops->writepage(&folio->page, wbc); - mapping_set_error(mapping, ret); - return ret; + struct blk_plug plug; + struct folio *folio; + int err; + + blk_start_plug(&plug); + for_each_writeback_folio(mapping, wbc, folio, err) { + err = mapping->a_ops->writepage(&folio->page, wbc); + mapping_set_error(mapping, err); + } + blk_finish_plug(&plug); + + return err; } int do_writepages(struct address_space *mapping, struct writeback_control *wbc) @@ -2579,12 +2587,7 @@ int do_writepages(struct address_space *mapping, struct writeback_control *wbc) if (mapping->a_ops->writepages) { ret = mapping->a_ops->writepages(mapping, wbc); } else if (mapping->a_ops->writepage) { - struct blk_plug plug; - - blk_start_plug(&plug); - ret = write_cache_pages(mapping, wbc, writepage_cb, - mapping); - blk_finish_plug(&plug); + ret = writeback_use_writepage(mapping, wbc); } else { /* deal with chardevs and other special files */ ret = 0; -- 2.39.2