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 99691C46CCD for ; Thu, 21 Dec 2023 11:51:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1694D8D0009; Thu, 21 Dec 2023 06:51:54 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 118018D0001; Thu, 21 Dec 2023 06:51:54 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F21B98D0009; Thu, 21 Dec 2023 06:51:53 -0500 (EST) 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 DF6388D0001 for ; Thu, 21 Dec 2023 06:51:53 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id A9100406F5 for ; Thu, 21 Dec 2023 11:51:53 +0000 (UTC) X-FDA: 81590661306.20.B2A40DE Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by imf13.hostedemail.com (Postfix) with ESMTP id 24CD720014 for ; Thu, 21 Dec 2023 11:51:50 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=khc6y35w; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=Ld55sd1l; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=khc6y35w; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=Ld55sd1l; dmarc=none; spf=pass (imf13.hostedemail.com: domain of jack@suse.cz designates 195.135.223.130 as permitted sender) smtp.mailfrom=jack@suse.cz ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1703159511; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=tJU+N/X0wPpRyjLNSDyU7/A5nuKKkSG6fh2fZzUVbgg=; b=ecvVQCpdMbjOQL3v3xWLAaJvMOKFabo+Ok87HPNyjMsNGe3w/F6wfWJXnTG5HfaGS/JqHO kTt2Ilhq/tFWe0uw9byQz+jHj0OTFbA6qqOBbbPJ1wmx1F9bfwY1ofWhwGVkjIZmlEsbUs UtZtna9SFl0rV/klW0SC6aMJB1pRzNE= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=khc6y35w; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=Ld55sd1l; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=khc6y35w; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=Ld55sd1l; dmarc=none; spf=pass (imf13.hostedemail.com: domain of jack@suse.cz designates 195.135.223.130 as permitted sender) smtp.mailfrom=jack@suse.cz ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1703159511; a=rsa-sha256; cv=none; b=yai8T7eviZbK9A75Q74yDdGEuQQi2bhCjJ1fPIOvJiuw+ePk+kHBwOtVZfONWtKOmz1thF 0VSU6c4SFiMxzTjlws8uErGrjNxOqBKraUcCyPSQMPinSE2ZfWeixgpMiQELvp7TIyXNId CQ89ZZe3PJTNKYyoUbMMYbgwiowsbA4= Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 767E621E40; Thu, 21 Dec 2023 11:51:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1703159509; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=tJU+N/X0wPpRyjLNSDyU7/A5nuKKkSG6fh2fZzUVbgg=; b=khc6y35ww4SWPoGtdOWsxicW1xqDkRHHnlvlkWaYajf7RbskdRX3lR/x28jBQPfEk9TvdW rJeq+NMXBp6PVTIg05LqmmhBdF1mtSi+YVUIShZjOQiw1drLVWbgoI2rpeVknC4/HnmB3Y cMXJu6PQ53DKjsyR1p5kX1+s8Dgd2OI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1703159509; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=tJU+N/X0wPpRyjLNSDyU7/A5nuKKkSG6fh2fZzUVbgg=; b=Ld55sd1lsp8FieBhjWWavqqa4BkYb0OMxpzkSjQnRx6UtuPnJY7xDfh3rIANd0A2VNMGbI N7y4zmX2Z8c9nYAA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1703159509; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=tJU+N/X0wPpRyjLNSDyU7/A5nuKKkSG6fh2fZzUVbgg=; b=khc6y35ww4SWPoGtdOWsxicW1xqDkRHHnlvlkWaYajf7RbskdRX3lR/x28jBQPfEk9TvdW rJeq+NMXBp6PVTIg05LqmmhBdF1mtSi+YVUIShZjOQiw1drLVWbgoI2rpeVknC4/HnmB3Y cMXJu6PQ53DKjsyR1p5kX1+s8Dgd2OI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1703159509; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=tJU+N/X0wPpRyjLNSDyU7/A5nuKKkSG6fh2fZzUVbgg=; b=Ld55sd1lsp8FieBhjWWavqqa4BkYb0OMxpzkSjQnRx6UtuPnJY7xDfh3rIANd0A2VNMGbI N7y4zmX2Z8c9nYAA== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 6ACC813725; Thu, 21 Dec 2023 11:51:49 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id FCcJGtUmhGVkYwAAD6G6ig (envelope-from ); Thu, 21 Dec 2023 11:51:49 +0000 Received: by quack3.suse.cz (Postfix, from userid 1000) id 0F223A07E3; Thu, 21 Dec 2023 12:51:49 +0100 (CET) Date: Thu, 21 Dec 2023 12:51:49 +0100 From: Jan Kara To: Christoph Hellwig Cc: linux-mm@kvack.org, "Matthew Wilcox (Oracle)" , Jan Kara , David Howells , Brian Foster , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 15/17] writeback: Add for_each_writeback_folio() Message-ID: <20231221115149.ke74ddapwb7q6fdz@quack3> References: <20231218153553.807799-1-hch@lst.de> <20231218153553.807799-16-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231218153553.807799-16-hch@lst.de> X-Rspamd-Queue-Id: 24CD720014 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: pta1s9gj3y53eqbz54gb61uiz39ss5qh X-HE-Tag: 1703159510-799143 X-HE-Meta: U2FsdGVkX1/iUnu++RzumNi6A+4O0w/uN2BDazZNjcR5GDpW1vo3FYAyTrFPjPaUpDok7t3JEfyCeJM9he4R7kSd2TRB5h1Gn5LUE8Ql/t07e6RZXlG1H0ddE7mpHIn4xZCG8MyyU4jAX7l7uz3pMqCA7THw2oHpJ1m95fikWI2h3rvOQmvrHzDEAOEoaoGhFxJK2RY6c7KCwpthou0pxQho+7HQC02YYJ2ekaAo3N2PwMzolDc99PS+oTVm8MVk/hmdArQLwcZToZ2BCHSWRH69ZDyoLXuN4ZK995N6Io6Y3142Y2+hSF3iMgPNju0xleSmKa/oaSrAlLvAhuxkdg8g1y4NEkudJyPHsYs49jB4N1NbaBhAe8zAN73Tyj4urkns0qk39FK2UdPnUzyRIoKIXrA5wuj9WenBY3U/F2zujZrl2JB7zFMlNuyMynTyWKCwnHzbeTY8SlhMJsNHOrPRmvSpmRCL30v/VIg4Q/BX2byIQN3VR6Th9QxXe8xuEdpzodSI+nNXnXawAQnt4wMU3Y1SvR/wqVOUhULeE7igYOHo5NW0gaFD+KfxOuoClwpkBWyMP5mpgYU/XX6X1nQBdOrnjNH3QgFqjTHiR5RPRDhN40bhrDLzl0rUiovNbBQEobAP8JWwKZngobgfCvZO1LlntqboPW6YO5u4E0niCFdZjVEKmIXo1haD0vO2wjoxcTPgjBMQwpCAmgqqh6PMeG1EuyIqMNEZIo+O8fU8ZVctJb2TlaXBph/plEDb8xSkgIouPgz4PXMoCxSPSTly0BL59IQeEBU/xMjOwwnM+lwKSjndP2d6jyr7lh+A7DI8na0qAUKD/z1c0bTijtf+RtxDWBFs8g3Txi2Ywmlj+Oi87EQ+C9YvnYiLqhRTNMrbB3jaV3BBHGDV0tKM8MFQrRZjLaQDIAlqGVcSIr1O0KAjZg3HY6ytr3osrgn+UTRXdj/4WVkVSRovrMw SfsGrdvx m8fyNy09hTjQ6+mBspDsK/21ukeunUp/CXAN2c3a8hXEn5XZXQizc6WizPjfVyVcPXryex4lwSgZHsoFDwE3Hr7V9473ezcXCEOAvgUD3yLcKT+hkqMND2TMmR+xiJk24hafx6dC2F5OUIa9VNS4cCzCFwaJxejSI2T1fvYDnve/mVB0lz8IIZS+ujC3/MKbD1Akq2uBSa41Er6dUlC7f1zwKNQ4R7PMwZ3hMfQ4UzonzwT7mXwU1r7un4G2f/eljJinHbw7+QNm6vpqWm7NsuqmoqaCl19x0ejagdB9oRXVrNO/Hed5HrLDwPPe89dCfvUrl00FRgTofS7oRmI9At+gL/q7UTGDRU9RZJXhGWPKmRjd1oSeWASYgASp6zzPbaSx2 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: On Mon 18-12-23 16:35:51, Christoph Hellwig wrote: > From: "Matthew Wilcox (Oracle)" > > 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) > Signed-off-by: Christoph Hellwig Not sure if the trick with 'error' variable isn't a bit too clever for us ;) We'll see how many bugs it will cause in the future... Feel free to add: Reviewed-by: Jan Kara Honza > +#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); > > diff --git a/mm/page-writeback.c b/mm/page-writeback.c > index 0771f19950081f..fbffd30a9cc93f 100644 > --- a/mm/page-writeback.c > +++ b/mm/page-writeback.c > @@ -2463,7 +2463,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) > @@ -2479,7 +2479,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) > { > unsigned long nr = folio_nr_pages(folio); > @@ -2557,9 +2557,7 @@ 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; > -- > 2.39.2 > -- Jan Kara SUSE Labs, CR