From patchwork Fri Mar 7 13:54:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 14006519 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 C80E9C19F32 for ; Fri, 7 Mar 2025 13:54:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C151A6B0083; Fri, 7 Mar 2025 08:54:20 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 944866B0099; Fri, 7 Mar 2025 08:54:20 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4A89B280001; Fri, 7 Mar 2025 08:54:20 -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 D27C26B0083 for ; Fri, 7 Mar 2025 08:54:19 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id C701155D51 for ; Fri, 7 Mar 2025 13:54:20 +0000 (UTC) X-FDA: 83194899480.22.23A8A08 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf11.hostedemail.com (Postfix) with ESMTP id 38C3D40012 for ; Fri, 7 Mar 2025 13:54:18 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="XZn6/qRR"; dmarc=none; spf=none (imf11.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=1741355659; 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=/z5i0Mk9Cv2/sY4L3FZ7BIchCOXs9aYcNdg4XHBiico=; b=G/AuxUnKzJXjoveT383b9Lop5mMBkIdVBea8y8EoAgSW9UsLKmUF50UQ9qk6vsCpvJyeUf CFGcLDz2FioHrPkci8BUG/E+th1Xsk9qcgfJUSvXj8cw/Qew9e/w3kB1ijAgaTabyljkdo Qzt8xvEZ+lDHoqQGa7gUPuWayUurh2k= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="XZn6/qRR"; dmarc=none; spf=none (imf11.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=1741355659; a=rsa-sha256; cv=none; b=og5X8fOvkByoxPfqWLKLlpZk/eUKhz7Iy2+8iTXB4ZT2BNt80BaemtSxuBmlgPMnfnpGoC btf77dkz8lCojwYntp8Y09h8MOpl79+q2S1IH7cJJmzWD+td8CpgWQ7edpJQN7kelLB1YM fvvPvGpotOK4aEcQv6w6jvDKjtilrV0= 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=/z5i0Mk9Cv2/sY4L3FZ7BIchCOXs9aYcNdg4XHBiico=; b=XZn6/qRRlZuA8W/65iLtP+DmJA 0a6R3g2imvgF9NFcjTV1wjItQb+Gm+iOmA3lKwb4uzXzpnGk1s+xHDW1io4ZlfX02BHlNf6G97ThN u2X2fj2Fs/PyNipIEfklLIt1qS6Yvysi39dBIgGZs19uBqdkje0otPp8X6WgmP4CQcUcfk3S/55aI T69BjppGgpcnsa2I1E5z1bACCLuqc1dYu/JT0Ao97YkukJGpxyiE6WN8iCl0IVdAD/ikqUSAgUX6q JHN4JQhhgTuWrUFBmcQinFwhgbp7J+0zmTpBe8abLU2VrxruKpPU3fThzjwCY8FxIcJckOvoQy44X nq+E4ZlA==; Received: from willy by casper.infradead.org with local (Exim 4.98 #2 (Red Hat Linux)) id 1tqY9Y-0000000CXGT-1pj8; Fri, 07 Mar 2025 13:54:16 +0000 From: "Matthew Wilcox (Oracle)" To: linux-fsdevel@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, intel-gfx@lists.freedesktop.org Subject: [PATCH 07/11] writeback: Remove writeback_use_writepage() Date: Fri, 7 Mar 2025 13:54:07 +0000 Message-ID: <20250307135414.2987755-8-willy@infradead.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250307135414.2987755-1-willy@infradead.org> References: <20250307135414.2987755-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 38C3D40012 X-Rspam-User: X-Stat-Signature: yn4hqe5yrxd6fhp8xra5wgnwu86dms3r X-HE-Tag: 1741355658-805223 X-HE-Meta: U2FsdGVkX18mTtPsgA1xurxREvOHBXKZZ+H0hK5t6cu+bwzYbBzc2eVHRr9blCPJNejOYcZdZafeLGdzMjyDp7qyy6FxWRlhYiR6tPCIKEj1jVsdT3J+RmZQWDi9t7gzTrWtna8lW+7IwEsKFqRk6N7g/la7ViJX76qPhi+s5x3lvmu5+xdXfinNpmER1LnDoxzA+t5CeXoHcAqCYBSVBefncemJ+Iyy5pOhbyHcbvwtoh7QhXI8c6rEabZGqdqdiM3aiwRAcAHc8oFcf0vI3tIS1C6wcR9rG5OLxN77dhfh8oVAJ5+PRdS7jvAZp0yJwyMgKOkv3Yr1S/qCy0zL5tCPNmc72SViG19Ll3MoCaLXonrhCRVZxYWUd1urYZyKt/bGT3Q9GXk4+gtwHqrRp1k+lEsLCWHuY/ES3g+J9MmoA8nJOWu+E5kr5QBJpe8cAb28yb1FmMCJFzwtcvC/VTjef1wj6UyB6HNwhZ0Do/ZxJIK07dUq12e9JDipknjzuMCOJADd4SzEtkK9Y8ftrhQj2mhapnp+THg6w3GdA7p29tnOfW2DcXhYonSHRahjeWPkNNrbbu/Aq6uH1C+dy+RjT0pBtWzsWKxj1B78bzvK7VEMYhsZyz2PEFGQb4sGa24DLKY4PhMxyICzRvkIFsUinrn/ccdIPA25R6i4JLTEhbCAZaIPqkgUcJQy/IYgVnkYyQ5gF4kw8fzNS11BGMpvPP+1d+23rhJg7dqPQKo1ML5ycPtkbz3lLA9TuoIRxyr59JyPvIlbDK9zKmBJK3rkBPERvVPaby+BRl4aN44HaGEbnWcG4xXek0vM1KYFJjHidL/50qMZoYdGh0NV6ql+F9JIyUMKJB2HeEJYX6Y7rjTexrRM6N5ik3LX5Oh8PEwLhp7Mq/oswBI9p4JTPSIdtRPvEcdb1x4EJKqLGk2XPIuYTdmllgmLsbUz8EZxtYADG8rfN/g8td++72h i4wApBYf aI06WBSW5xkx4N81dFDiQwUROX3Fnr0lv3tzOh0e0B4Iz6rxdwk9ZXWTkM+ciYWdFZKZXjM9vIviX0JAFnBOBhSodjnMkP6kgHoeRhZslEa9Qq4ROxrxvYHGSHv+i5CaZhqRSZJAsE4qghABwJwLlObTNB1E4NmTDELrK65R1CoCmw8FzWpkKgvl4glCk0U2SS5D0w6WSpJ6bLrq+HlBGAbgIWriywmzLQhlgXJEOQLxt/Ukr9e7h3i7YABy5+EfRJDgzlUHjBha64/UeI1MlyTtHl+IUYQlFInxL 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: The ->writepage operation is going away. Remove this alternative to calling ->writepages. Signed-off-by: Matthew Wilcox (Oracle) --- mm/page-writeback.c | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/mm/page-writeback.c b/mm/page-writeback.c index 18456ddd463b..3cf7ae45be58 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -2621,27 +2621,6 @@ int write_cache_pages(struct address_space *mapping, } EXPORT_SYMBOL(write_cache_pages); -static int writeback_use_writepage(struct address_space *mapping, - struct writeback_control *wbc) -{ - struct folio *folio = NULL; - struct blk_plug plug; - int err; - - blk_start_plug(&plug); - while ((folio = writeback_iter(mapping, wbc, folio, &err))) { - err = mapping->a_ops->writepage(&folio->page, wbc); - if (err == AOP_WRITEPAGE_ACTIVATE) { - folio_unlock(folio); - err = 0; - } - mapping_set_error(mapping, err); - } - blk_finish_plug(&plug); - - return err; -} - int do_writepages(struct address_space *mapping, struct writeback_control *wbc) { int ret; @@ -2652,14 +2631,11 @@ int do_writepages(struct address_space *mapping, struct writeback_control *wbc) wb = inode_to_wb_wbc(mapping->host, wbc); wb_bandwidth_estimate_start(wb); while (1) { - if (mapping->a_ops->writepages) { + if (mapping->a_ops->writepages) ret = mapping->a_ops->writepages(mapping, wbc); - } else if (mapping->a_ops->writepage) { - ret = writeback_use_writepage(mapping, wbc); - } else { + else /* deal with chardevs and other special files */ ret = 0; - } if (ret != -ENOMEM || wbc->sync_mode != WB_SYNC_ALL) break;