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 E7E2DC47258 for ; Thu, 25 Jan 2024 08:58:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 76CB5280006; Thu, 25 Jan 2024 03:58:52 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6F6D1280001; Thu, 25 Jan 2024 03:58:52 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 546A5280006; Thu, 25 Jan 2024 03:58:52 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 419C0280001 for ; Thu, 25 Jan 2024 03:58:52 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 194FC40D68 for ; Thu, 25 Jan 2024 08:58:52 +0000 (UTC) X-FDA: 81717233304.25.C626AAD Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf30.hostedemail.com (Postfix) with ESMTP id 76F1A8000D for ; Thu, 25 Jan 2024 08:58:50 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=r5e1XEM8; spf=none (imf30.hostedemail.com: domain of BATV+b97a0fc658bf3e588113+7459+infradead.org+hch@bombadil.srs.infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=BATV+b97a0fc658bf3e588113+7459+infradead.org+hch@bombadil.srs.infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1706173130; 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=btL3AciRr+h+xXxfR+Yq/41M1ZAR/B4m6dVFwBdRQv0=; b=fc/PUp8Ns/nS+ox/Zf+2jCA3yUJISKFdS2qbrakARz+oLxod7JU+0h0lQttQscQfal0JML RjCV3jN6PmcclMcpQyG+8TXkkX0/Nedig1dSzikCgwcYcdIg1SbCjVFVi+7LIRkYPTYYJY k38tWcwa2GZy6R3J5j0oHpMGrhwBKVc= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=r5e1XEM8; spf=none (imf30.hostedemail.com: domain of BATV+b97a0fc658bf3e588113+7459+infradead.org+hch@bombadil.srs.infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=BATV+b97a0fc658bf3e588113+7459+infradead.org+hch@bombadil.srs.infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706173130; a=rsa-sha256; cv=none; b=3ETf3xiLeA8g6zR4EfEdo19ogfkwm8MYbMTXz8WJYqOq6UWL9A7sML8/z05b2F5IuTv6zf foVIWrh30D08fwNKD9dD94MEjCNO6RRvWrhHub/RirRTEChq9GzJQIWZU38a5wWrmTJqnz 1zRMUZkpCIX5QEpMU+2F0Be1xoh6XrM= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; 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=btL3AciRr+h+xXxfR+Yq/41M1ZAR/B4m6dVFwBdRQv0=; b=r5e1XEM8S9gQh8rBNXuD00dQSt nekiXLsV/Vk7BZw/6syGHv6F3sB9VECwP2G0QgBhGJeOnzfwy/mI92WsKGhst2tCM+Wi3az+xbmxJ gZldsll43mBMkAMXLPMaby4NPM0MwucidYZvYToaJikMi+1+p5W8ln2WpHXKffi82sEhTQL+PyRIO pO9/dx0INBNTIOEi5ebmi9UV+Yt1GOMFQJnURTXviErty+7hbRM4BtU+fUFe1923PB5lYFBpAy0j8 iwtnO4feBgof8IrJ8Sy8flg8sIbHfcVGuX/zP/ZWCe8ajPAAkpzPcFr8i2L62RcfwSsy1r6CWYetm NBUCsxaw==; Received: from 2a02-8389-2341-5b80-39d3-4735-9a3c-88d8.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:39d3:4735:9a3c:88d8] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.96 #2 (Red Hat Linux)) id 1rSvZR-007QQO-0Q; Thu, 25 Jan 2024 08:58:49 +0000 From: Christoph Hellwig To: linux-mm@kvack.org Cc: Matthew Wilcox , Jan Kara , David Howells , Brian Foster , Christian Brauner , "Darrick J. Wong" , linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Jan Kara , Dave Chinner Subject: [PATCH 12/19] writeback: Factor writeback_iter_init() out of write_cache_pages() Date: Thu, 25 Jan 2024 09:57:51 +0100 Message-Id: <20240125085758.2393327-13-hch@lst.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240125085758.2393327-1-hch@lst.de> References: <20240125085758.2393327-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html X-Rspamd-Queue-Id: 76F1A8000D X-Rspam-User: X-Stat-Signature: 6ngg8wbzyqnzxx1e375jji77zc6t1i4d X-Rspamd-Server: rspam01 X-HE-Tag: 1706173130-761352 X-HE-Meta: U2FsdGVkX1+5+4CYVzzEnLbmPOscbPklR3OxtCz+KXAL1J4CHjeZddelMWACT3fW2UA/NAcrtGdUGE4jDSUKynoXc3UuE4bI+SzCiZ+aGNySVhi2jfQnSQXl828SRdidLS57zKd/Fq6agS2agmeCDezpDYEI6CFbP00xxSM9gACxVi1giBj0fweChl61Vudgal3KX4GXD1UzIEY7zaeAsYfRjxBV2cpWSF4sUPwSfIuOO+xSxeR8wiWl2l9RshBIfZ+WpDHNa88s6HweSfLKiMsYxrfU8/HUnUquM+SKSEJI0DbPcqabA/NH+Eq0YFloROP1pdvF13HEIZwekXyd99I8nd+QRS0xjMA/Kc+tk0vkWX6dutRro67HeXJW1Z56fV/6CNz4uv7dCc2WszG7vbfV5pDk70QptQfjJKlOROs5e302H6kU3avxcKs/dWvAk70It0TFiyoijQLT+zysW9ToxTNeEkCoVsZ5dl23QYLUjNnuGf4Zzx66Q/LaqPWVsZ6dNJ6XufO2001dxK6/wUyaWWf2I8h805CT4st8MG/WQLCxxt4O72SJIv2Pryv5UAUClwXFAtFtACiEQPGoo6asholscUB0Nf7XIlG+R0WcrIA6yQOtS4C0aDhxiK+kG/7J+8/S5zGmpwihgm+Zr0LvZPvm24TIu4E8mB/QOV8tMdEZpnGLQzN1QVFrI8fWS/mgVgtR28X2yYeHbaFD8l8IlpIbEyRbGqTdH4v0VjoaprovJVhI9Xpn5NyvK1C38ZL2YV76k3W5Y0PbVO6O97N2bGAehHvZCTXHeRpQN68Ymj0iJqzq7O8zMZ8sXdESLxCMqkcFTKqRX8T6a5kv4ihITR5vnTilELBxFIIGB/96s2OAziqV25f1IJ91tF0KL6o7oRJEKT6JfcxZpiFG1KEFqU/hYKTcfwSVQFnf6fSL9wE30ys4xjmfAj6IDkCOtySnmlRgdrKObR8F+Pu kRPDZXFe L7kI3/74pqeB1e7AxpGGbjtGzXvnURhrkwdh3w7f6RP2uFWjpdwIXJAHVRd+hL26N59eV5ZJ8OiX5ckvL2JXfhv/r7o/duUqdvN/HzYboFaC5vZt3G09+2uJriVir1L3aIi4I74PR1jqKydgF93rkER33K4RZMw2pFf6H1xJ33Pwt+I3iDDZQa2zPUO4mCesWEnouUJOaHJOSfx1t9tbcb8uwHZk8XJJkKzxI3ru+dxZ3r7j+/uPp/XRAT+8NpM3+/W8M0gQKgsj8LpovZok9kMEBc1Rk2tVwBtYNaZ3OOJEqHY2/q8EA/9c59Y/gjaW0obj077PEtcsz/5FcOsl0BuPgQq1FRLyQs0kFT5woHYQHPVn+IBWYIS8qO1obrgzdF+WJ3WPk/HflO/PUIcX19SGUOX22S+/fvRI3hQNb+D7Orao06e7rmfTYfJJNFI9JrVB9gjGYFJ4UpYk4AXQz43SZpSPQcW9AKPpajBGscgMAo6ZYAvNe9ndDdpzpps4m7kGbNt/21/aj8Qt/75+AWIzcONkw5gM7hPb7 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: List-Subscribe: List-Unsubscribe: From: "Matthew Wilcox (Oracle)" Make it return the first folio in the batch so that we can use it in a typical for() pattern. Signed-off-by: Matthew Wilcox (Oracle) Signed-off-by: Christoph Hellwig Reviewed-by: Jan Kara Acked-by: Dave Chinner --- mm/page-writeback.c | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/mm/page-writeback.c b/mm/page-writeback.c index 432bb42d0829d1..ae9f659e6796ac 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -2446,6 +2446,22 @@ static struct folio *writeback_get_folio(struct address_space *mapping, return folio; } +static struct folio *writeback_iter_init(struct address_space *mapping, + struct writeback_control *wbc) +{ + if (wbc->range_cyclic) + wbc->index = mapping->writeback_index; /* prev offset */ + else + wbc->index = wbc->range_start >> PAGE_SHIFT; + + if (wbc->sync_mode == WB_SYNC_ALL || wbc->tagged_writepages) + tag_pages_for_writeback(mapping, wbc->index, wbc_end(wbc)); + + wbc->err = 0; + folio_batch_init(&wbc->fbatch); + return writeback_get_folio(mapping, wbc); +} + /** * write_cache_pages - walk the list of dirty pages of the given address space and write all of them. * @mapping: address space structure to write @@ -2481,29 +2497,14 @@ int write_cache_pages(struct address_space *mapping, struct writeback_control *wbc, writepage_t writepage, void *data) { + struct folio *folio; int error; - pgoff_t end; /* Inclusive */ - if (wbc->range_cyclic) { - wbc->index = mapping->writeback_index; /* prev offset */ - end = -1; - } else { - wbc->index = wbc->range_start >> PAGE_SHIFT; - end = wbc->range_end >> PAGE_SHIFT; - } - if (wbc->sync_mode == WB_SYNC_ALL || wbc->tagged_writepages) - tag_pages_for_writeback(mapping, wbc->index, end); - - folio_batch_init(&wbc->fbatch); - wbc->err = 0; - - for (;;) { - struct folio *folio = writeback_get_folio(mapping, wbc); + for (folio = writeback_iter_init(mapping, wbc); + folio; + folio = writeback_get_folio(mapping, wbc)) { unsigned long nr; - if (!folio) - break; - folio_lock(folio); if (!folio_prepare_writeback(mapping, wbc, folio)) { folio_unlock(folio); -- 2.39.2