From patchwork Mon Jun 26 17:35:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13293261 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 26434EB64D7 for ; Mon, 26 Jun 2023 17:35:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3219A8D000A; Mon, 26 Jun 2023 13:35:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 233EB8D0006; Mon, 26 Jun 2023 13:35:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 05F598D000A; Mon, 26 Jun 2023 13:35:35 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id E226A8D0006 for ; Mon, 26 Jun 2023 13:35:34 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id A95C814081D for ; Mon, 26 Jun 2023 17:35:34 +0000 (UTC) X-FDA: 80945600988.07.A66B8D8 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf23.hostedemail.com (Postfix) with ESMTP id 9CE1B140024 for ; Mon, 26 Jun 2023 17:35:32 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="W1PA+/Bi"; dmarc=none; spf=none (imf23.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1687800932; 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=DbRDOwy4aGYzGm5HeqIsIhOnoGhV3uqwtbzHnV71lmw=; b=mKFI+QyRvphM75qAl9Jvzv5ISSk3l2W1z5bYkbPldtAe7uG0yZAbpnecPGoivNtP2V7D5k YaSMJN+Mn2PoJ8QQNrcE4noXUGyKatOfdN/KVcaFC302xdxYqANJFLwVv+Uvh8Zafkm/8Y R4cKvNX7VDlzbrfydiV0ouFrXX4zofw= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="W1PA+/Bi"; dmarc=none; spf=none (imf23.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687800932; a=rsa-sha256; cv=none; b=fmotOqE4JlymWUUuUa+4napSJ8hZWIJu1u9GdmrLHhguqtumIY+aO5PeeNabvy4YEvmK6v xAWGWBFGhinVyc/IyOacgWV5JzzWNZTe8pwtFm6sstT5OezNFbNSjBCjFZvN19tMAWxVrX OYIsbUmwkj73zU0eA5FGDR+n7lw53Pw= 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=DbRDOwy4aGYzGm5HeqIsIhOnoGhV3uqwtbzHnV71lmw=; b=W1PA+/Bi8v1fqLdsB7yl772V0f RgwlNsF3bvGRmX6GeWkooNi1wYpT1f3iUIzX4l7MUM38mQ9Zw5s7SQOuMEMB53KdS5tSL+OHJSisS K87JMB2fNoyImDp7TG+shhEPLoq4/BISTARhOn43kcMebEMFO3G44dQ5TWC3FZLmULKJjwLPoTUNq WUIpgwde5+sWTO8N2dyN3HIV4wxNNuQ+5Pvpm5cCn3mV9Sxw1bvQhXNl0ETOjQa+6UJarTN7j2N2A ahz+Xz2UCRm0wunSNn5GNma/A151vXBBaymuvJ4fLZ0+HcnPGNDiVY6mFsk/ZzC0yxz2xPztK9RUp bM2BXbXg==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1qDq7Y-001vVI-28; 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 10/12] writeback: Add for_each_writeback_folio() Date: Mon, 26 Jun 2023 18:35:19 +0100 Message-Id: <20230626173521.459345-11-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 X-Rspamd-Queue-Id: 9CE1B140024 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: fa3oq4ed9fp8d1mruxd89os1uzbsya3b X-HE-Tag: 1687800932-723722 X-HE-Meta: U2FsdGVkX1/ldFjVMdFFDFiEohPMnAcUPIw70lVr08J035B4T4tey3BDx0/PRJSVwA7kBUHn/JV1ijGFfYeXSfd6jVCeeiyj5R5cp91/hNNeXcp0ag59N4kSxph5b75kpKWBBynEYe4diA88rZjCo4gxYynugpsUiAfSyGFcWmyZC4lWxggcOGEuoBr07UtyuggyDQwWDbwr8JJ9AKXBMPEZeysl66WU1o3yq/TMfalPGfwicRIKRcxc9IwEvcpoidGZyWYC/JPxrBRX3oSIxcOiSsyG25Likzd2LUDRk/VhXGf6001JuDGOaGakR0H8utw1K6vsZci8kjuABVlVWzN8ikXc5ZmxEfgBrFmCsNZXw4a+guPfflPChjmiSMKxGcqSn4ce0tJyITp0vl+AGXtiCjmZzdypnvKVz4lejOVoI6VGi66O3/rQWEULBMDPyAs9CJtHJTzBliT/BjzoQMOXq6ZvU0drje8aavLY2lc3fQlBs4ri3hVIWBaB10zfBVC2KHx4EJ/23mBYu4u+6boC0MLcgNTOTo7Hs3oi3VtNiZtRLFWe/pyXVqLPxolfHn3gDSd8ifI6bASDcs3jbjxKcZ+k5ECVGJIDmqqTshJ0YrMAaVyCBMxkH6qpJCge/RbBNmkgeEXoLC6qRvwx+/UUtPH2NXQKO883uQWnFf95+qJMRjrl7ahZFjqhf7FwrQCjNoz5nkUzHOcwTCTUomWfEsmISMAKtspRHZEUKsOonlvbXzp2el4/RmHjN5B5TD15ceeVsu2A4qlsacQc4HimHZ8wmrvacRZk8eZ9IfQ/2poS33YsP4Lj/aGx1cy36Zyxzq3cgIfZ5QDNuObPQd1gKFjeFGufOngtuFMixb5KfRLy9TBjPmCIgNmBnYNXBOzuK/MoE1q5qEgzEF6a8EeuhO6xxemztU/8n+ZkqUwtGNVf3rrVuE4+xNGvDyQ2Q/BzZs0e15LyVzrKfKi qBvObGC3 ZVK7zy5+bjXDb52Y9UNTL3N563IWiqkidm0FDvEodl3yUtGSHVJjccYw7U/vlI85j82dhkIJ4VNC6iWzNUXOaJHS67VwYFhzwSXN1HVDVLlXSps0Odyf91yDtnUeWovQPitQhwtaxqVEPd0VpdhpDC2kaQPIugMBYwdICBHxsV3GjamH5oUL4MjHFx9GzvFXxSvTOMGl+6cqER0MzBl+oVieOSyeAl4EFrgA7 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: Wrap up the iterator with a nice bit of syntactic sugar. Now the caller doesn't need to know about wbc->err and can just return error, not knowing that the iterator took care of storing errors correctly. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/writeback.h | 14 +++++++++++--- mm/page-writeback.c | 11 ++++------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/include/linux/writeback.h b/include/linux/writeback.h index 7dd050b40e4b..84d5306ef045 100644 --- a/include/linux/writeback.h +++ b/include/linux/writeback.h @@ -369,14 +369,22 @@ int balance_dirty_pages_ratelimited_flags(struct address_space *mapping, bool wb_over_bg_thresh(struct bdi_writeback *wb); +struct folio *writeback_iter_init(struct address_space *mapping, + struct writeback_control *wbc); +struct folio *writeback_iter_next(struct address_space *mapping, + struct writeback_control *wbc, struct folio *folio, int error); + +#define for_each_writeback_folio(mapping, wbc, folio, error) \ + for (folio = writeback_iter_init(mapping, wbc); \ + folio || ((error = wbc->err), false); \ + folio = writeback_iter_next(mapping, wbc, folio, error)) + typedef int (*writepage_t)(struct folio *folio, struct writeback_control *wbc, void *data); - -void tag_pages_for_writeback(struct address_space *mapping, - pgoff_t start, pgoff_t end); int write_cache_pages(struct address_space *mapping, struct writeback_control *wbc, writepage_t writepage, void *data); + int do_writepages(struct address_space *mapping, struct writeback_control *wbc); void writeback_set_ratelimit(void); void tag_pages_for_writeback(struct address_space *mapping, diff --git a/mm/page-writeback.c b/mm/page-writeback.c index ef61d7006c5e..245d6318dfb2 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -2451,7 +2451,7 @@ static struct folio *writeback_get_folio(struct address_space *mapping, return folio; } -static struct folio *writeback_iter_init(struct address_space *mapping, +struct folio *writeback_iter_init(struct address_space *mapping, struct writeback_control *wbc) { if (wbc->range_cyclic) { @@ -2473,7 +2473,7 @@ static struct folio *writeback_iter_init(struct address_space *mapping, return writeback_get_folio(mapping, wbc); } -static struct folio *writeback_iter_next(struct address_space *mapping, +struct folio *writeback_iter_next(struct address_space *mapping, struct writeback_control *wbc, struct folio *folio, int error) { if (unlikely(error)) { @@ -2550,13 +2550,10 @@ int write_cache_pages(struct address_space *mapping, struct folio *folio; int error; - for (folio = writeback_iter_init(mapping, wbc); - folio; - folio = writeback_iter_next(mapping, wbc, folio, error)) { + for_each_writeback_folio(mapping, wbc, folio, error) error = writepage(folio, wbc, data); - } - return wbc->err; + return error; } EXPORT_SYMBOL(write_cache_pages);