From patchwork Mon Jun 26 17:35:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13293256 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 CC81EC001DD for ; Mon, 26 Jun 2023 17:35:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0FCD78D0003; Mon, 26 Jun 2023 13:35:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 085FC8D0002; Mon, 26 Jun 2023 13:35:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E68748D0003; Mon, 26 Jun 2023 13:35:29 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id D2AA38D0002 for ; Mon, 26 Jun 2023 13:35:29 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 7CBDF140783 for ; Mon, 26 Jun 2023 17:35:29 +0000 (UTC) X-FDA: 80945600778.09.7DB101D Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf27.hostedemail.com (Postfix) with ESMTP id 1E1B240012 for ; Mon, 26 Jun 2023 17:35:26 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=qIKh3LKN; dmarc=none; spf=none (imf27.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=1687800927; 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=sd4UR031RbDntAg7Q2TtCsIA81STdESVBYZOrBi6xDM=; b=s3PpR34Wv4kf6DH7V9+WEt5/SY0BnKYMBUD/96h+bgukLL8wlb1dP3a06eNxJqX9AbstCN 3SP8lAAfLkA3XBxGfFHrYjQx/294Lk8vBkasxQZXDmLq6bRpJXyWJa3bNY6W6qOqx4tgaC CzZQTeW4Q7nYzc8b63/c+TgpNDNBtH0= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=qIKh3LKN; dmarc=none; spf=none (imf27.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=1687800927; a=rsa-sha256; cv=none; b=yxzCT/UXO3pZLeOtjGxYzHmoFv9c5AoHUUodoaMxkveAZ9KUtzOB2jEtx/+Fcd0BH60yx5 pdybnoLVNFkGJUZY9quNx4ujtWjZ1y3r3TjvMQ+qyIdKF7Hy+EmE3aJHYYkBoBwvcHVFN5 iJ0MYonFsTj5TrFLpB8YOOEBMiv0Da4= 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=sd4UR031RbDntAg7Q2TtCsIA81STdESVBYZOrBi6xDM=; b=qIKh3LKNsyIKL6wn9vPVDEzZ+D eEqSPJa/7CQUC5xinii35WBEGVSuPYk98nQd3Rk665j4winBw8s0gcTwod5j//SI78kDfO8LiKpb2 QxPbWsAW0AuHq/5s0VxBqJ9MT/wDfN/+rlOdpY2Fk2YtsFFIPIG9BsONHh4138hmsct/3ELFT9roh e0+vNhPUTa71jfAWtaK5OPKL2MmIEixL3WqzjOmsa18TETHpzf2dOygWdHq4KBAPddiWMAqpgRmR3 ydq70lu0ywMlmKyHpMvrSv53DWf8nfN6Ya3A+O2Bn3zHyOeojHJDOD+gOEsd739ZMiyDu/U2u0Yl8 Ak2tJitA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1qDq7Y-001vVK-58; 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 11/12] iomap: Convert iomap_writepages() to use for_each_writeback_folio() Date: Mon, 26 Jun 2023 18:35:20 +0100 Message-Id: <20230626173521.459345-12-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-Server: rspam09 X-Rspamd-Queue-Id: 1E1B240012 X-Stat-Signature: zcd5hnb81sd3178zsioffdo4n7h9djhy X-Rspam-User: X-HE-Tag: 1687800926-452710 X-HE-Meta: U2FsdGVkX19Ilc+SZJDYNyD9scZ5oio2vfg1gstaqrAPROseT7bfVyV9qeqJb5rYjsLNlSCLxMYBoaqrGW35Yi1JbTZjJnW4qHldxGXPoD7uDzRBw3QanNSEKv8DVs8lFHuMmzXfUFY2pxPNyRdDBg7sy1DjnC8UC+W9l3QSEvGbNpjhkNN6uL7P5fMWDYuaIJ8ATtscRrvyHL1rvQIMamVCSoZPTVvnDR39OX4nujkQ8nx5+u9tjVovzwlalMBo6ncX0KMwcW2v1PCiIX5M2hJ7J11jyQGtw+7Fj/LPDeG/lGqLUky5cemR7qR5J1QBy0mj3C2zM3XJ1AvyIHKN+lvnTw3hXfpHu/qwJYgcdmoeDTg92y6vWtqLtSRYICaA/tLuADLxk0aM1D148Kc90hRc+TzYIw55izfU0gI3zlqo6yOI+y+w4mcQRbnxu0PZ9OjlPGAdcibX3NWQ/i7t1Sn+24Qcr5PI+Of07HQhKhelgbd7GRMDhr6oU5nrTcNFvj1VHPC7Yis8Q2UxIX14Wky6yYNzz/PL/rgt4FQaNP30X7J/meCVND/i620svpYU2xQ9tApZhPY3QhRt30n6cr1K+ILtoZDLIgZCXoyAqE4dNMj0jxzcOvXElYuIUUWu1bCb4auTMTm1255fvBULeNv+9kXHP6Qb8Dx83OQiagvQcGFYB48p0OTQ7qwdu+eHdt49NOnaUw4mEB7GESpoRsSXn/uiC2o8oKLGDV7Wh9daDhISiBX/IFMJH+MwqzteYX9azhfGan4XdMrREqFwWWE96ZURUxm5S5L0kQ0hlv1J7umOlVUnPX45EEdaQqGB5Dn01wEPU0hNRaiu6lrnWNHnzTHPZBw0zzoHSQW6gvjHp00Roik+wP5yPr+NJ95BC9+efHdznau3lawgJF2T5ZjsL/IGBrHg+7l9v86DG36VhmW88Jq+r3LEDPM80bfrzEqN9HJEQPkjfCPrWCT uMoMd1AM 2IyHav4ocdLuE95+jgwIaUNmulsr2Owauhrdiwd9e1gPxBR66MYJA9X2piEb+eeKv6GunlDtbG5wMMNUlFLgt+Fc/Vx+S3vT1xUXRvbDEdxQLmbgfpTWzL+KVx3cPjq1sdqWTjbrULonxbTAA0ajzMZ8992t69Iio8/OCZMb7zmH4r+iFOr/g2R4ZoU1xvVK7XumMqUHJE/grpn0HVmwIozXHKaB9/CV4ly0h 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: This removes one indirect function call per folio, and adds typesafety by not casting through a void pointer. Signed-off-by: Matthew Wilcox (Oracle) --- fs/iomap/buffered-io.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index a4fa81af60d9..a4dd17abe244 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -1711,9 +1711,8 @@ iomap_writepage_map(struct iomap_writepage_ctx *wpc, * regular allocated space. */ static int iomap_do_writepage(struct folio *folio, - struct writeback_control *wbc, void *data) + struct writeback_control *wbc, struct iomap_writepage_ctx *wpc) { - struct iomap_writepage_ctx *wpc = data; struct inode *inode = folio->mapping->host; u64 end_pos, isize; @@ -1810,13 +1809,16 @@ iomap_writepages(struct address_space *mapping, struct writeback_control *wbc, struct iomap_writepage_ctx *wpc, const struct iomap_writeback_ops *ops) { - int ret; + struct folio *folio; + int err; wpc->ops = ops; - ret = write_cache_pages(mapping, wbc, iomap_do_writepage, wpc); + for_each_writeback_folio(mapping, wbc, folio, err) + err = iomap_do_writepage(folio, wbc, wpc); + if (!wpc->ioend) - return ret; - return iomap_submit_ioend(wpc, wpc->ioend, ret); + return err; + return iomap_submit_ioend(wpc, wpc->ioend, err); } EXPORT_SYMBOL_GPL(iomap_writepages);