From nobody Sat Feb 7 21:05:36 2026 Received: from mail-dy1-f181.google.com (mail-dy1-f181.google.com [74.125.82.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2D9412C3277 for ; Wed, 7 Jan 2026 21:02:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767819732; cv=none; b=auUVj7dya9LE+nBCZcZBVGNBQS+TV3qvgaPOzi1ale4VsotSedkr5130YbAEy9N7xpnSPfX6IndJpW6b/Vc4j4f5sq5uMLRxVCEg++Ss3Ps+uKwWzvQF2BCGN9AQobu8YicJPJmSQ+UfZnbhXBJonIqwIUaeuLVyrL9jjK7IPzA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767819732; c=relaxed/simple; bh=+OMCjLpYjNGGYfZdJjYQd5xrfdW6cvuAZrYjo1yzsPw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gSU1rTBYmhHVbq4EQ4Aqy2I5eCYm+zjn9+6ygNyg3wHt2XRsvhNp7YKrPyC5iHgCepHTIlza0h7WZ65q2auVKCFQoVu3XrUVYSyQ4yaA62WReqt6y6jVUJvML0E491GmKngkxBZHorC1VRTI7RpL0YCGUP+9wuoVmoeMyRktp6A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=dJEfy+e3; arc=none smtp.client-ip=74.125.82.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="dJEfy+e3" Received: by mail-dy1-f181.google.com with SMTP id 5a478bee46e88-2abf5900cd5so2144825eec.1 for ; Wed, 07 Jan 2026 13:02:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1767819730; x=1768424530; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GD9+M0L1TL+nHtGjY77JqppAv2xqxZhHU8cYw4+7xmc=; b=dJEfy+e331TidlLiFpSFFrBPOS797CIQ7A5F/1RdsRprkf5blG5ocgPphFXMjJ2VTs qldT2EHbWo8YF/XD0m80NbNlpgWufKWgXkhISKPnraVuy9NC1bPXSh9CqMmsdMVlqOmE y+EvALPA2oGkRtKzq3XcVULdycFe8x+i0KcIx3LjhDfoAIvbt2qK3sgGWiFRrqJKp174 VttQxjx1vQirpmU0ndKAyrwlHe9NkZSLBQadvKYHFEA3yrzQIICuKh2gsiWqAibc6LE0 +v8bk7nH+PqZDd+yURKNCoSB4QrX3pkVy6wHzidPgAMXS2d+x4n7p+LbmSDphuH7Fv9k ngJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767819730; x=1768424530; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=GD9+M0L1TL+nHtGjY77JqppAv2xqxZhHU8cYw4+7xmc=; b=GO67qsneTZDJ87OR0fEyXfuWNVDhPaAs+7r80ynnTUD6cGe1tN2ovS8nNA+5arOKI8 zknTUEMLSnOKGyzpSrzTvhNi9MSliTXIQYZ5DVrBmWTy6oIFqIE/WQSpYFn8HGrPLozX FohI5FOfw0FRRyPrRelZbnNMUuVWPXRs7h/dNkC9X0ql002Dyy8p/EnrFgyG8m4J70fe wPPjEdUvbS+aRYj4lcF4d2uhH5yCwJZM2HIhRfAiq28KOwrbPb7jr3IDfJJNIuCKb2e8 0Syo48DmXOUF9HSUXG5ovfUG2GbJOiIxTOTF0yDSaBwoTVEucsPL3rTrCQxd5Z6/VqLu cMow== X-Forwarded-Encrypted: i=1; AJvYcCW1AIwPVW2XbRUBKNo5EAEDkd2b3Fog/4vEwGUH7NjhgZp1jfA5f0JwFnIPEDhz2QC/h9VLty3Cyk0Yv8U=@vger.kernel.org X-Gm-Message-State: AOJu0YwDdod4ij7T4B0OBc6Q2CN9ME191jlc6BCaOfxKrIlOEao46hGt SYuw2sgZb1aSe6deV+spIvEdACuAb3km1XdeNM2pqZgTWtf1RZ9BnHSP X-Gm-Gg: AY/fxX5ueEMLHvbQyHauXuEzDWMXkEV2M0ZQbI+U76h+iMnJ3FUnTIPMJDAEN3LX0si Wt5M3idHH7eLag+m3KIDAvuBS/7I7BxIVzCpAeF+d1W+FuBK0AFRmu3H4SGYseXJ85Fkm9xnbH9 +/lMIIdZ6AedA07VxnTBb8l5PWjdVa80KQUd1SZGWz2kQ62j/YeQ/GdWiqdFfUJ8cMLqTMUVYIE DHMahLlLCMVIXdGG1xgWzrKqF7WYL9RTrL7eyk6Indb43BDeqyJxLhNVO6jDk1+DwPRAq1NAyQA UvEoSR58OC8I0hjpCITmydoY7jJae8gzSENi+E+IyqxpLtKzHqD2+0IL9cdCCvj0yNWCXM6NDNG O2718rnpEWjJAzXXw6m+T3H4DjjK9VnmY0ko8SH03wH7N1yWFmILWVkpbaxgfxCtN+z2xTaE6G3 6cjWFeSqCHoxZD1EcqZNTygp7K2W2uhahiQpgSePNr+1spkJwsl1JCSZ1d4iBE X-Google-Smtp-Source: AGHT+IFmRzf4pdV3GuAH14ZP8NjG8Wy8k2FewwYwSLBXQ+brWhVevt7B0bSV0EESgMlR/cm8NffJRQ== X-Received: by 2002:a05:7300:8aa4:b0:2a4:3592:c612 with SMTP id 5a478bee46e88-2b17d2d6606mr1893273eec.35.1767819729839; Wed, 07 Jan 2026 13:02:09 -0800 (PST) Received: from celestia.turtle.lan (static-23-234-115-121.cust.tzulo.com. [23.234.115.121]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2b170673b2esm7730320eec.6.2026.01.07.13.02.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Jan 2026 13:02:09 -0800 (PST) From: Sam Edwards X-Google-Original-From: Sam Edwards To: Xiubo Li , Ilya Dryomov Cc: Viacheslav Dubeyko , Christian Brauner , Milind Changire , Jeff Layton , ceph-devel@vger.kernel.org, linux-kernel@vger.kernel.org, Sam Edwards Subject: [PATCH v2 2/6] ceph: Remove error return from ceph_process_folio_batch() Date: Wed, 7 Jan 2026 13:01:35 -0800 Message-ID: <20260107210139.40554-3-CFSworks@gmail.com> X-Mailer: git-send-email 2.51.2 In-Reply-To: <20260107210139.40554-1-CFSworks@gmail.com> References: <20260107210139.40554-1-CFSworks@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Following the previous patch, ceph_process_folio_batch() no longer returns errors because the writeback loop cannot handle them. Since this function already indicates failure to lock any pages by leaving `ceph_wbc.locked_pages =3D=3D 0`, and the writeback loop has no way to handle abandonment of a locked batch, change the return type of ceph_process_folio_batch() to `void` and remove the pathological goto in the writeback loop. The lack of a return code emphasizes that ceph_process_folio_batch() is designed to be abort-free: that is, once it commits a folio for writeback, it will not later abandon it or propagate an error for that folio. Signed-off-by: Sam Edwards --- fs/ceph/addr.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c index 3462df35d245..2b722916fb9b 100644 --- a/fs/ceph/addr.c +++ b/fs/ceph/addr.c @@ -1283,16 +1283,16 @@ static inline int move_dirty_folio_in_page_array(st= ruct address_space *mapping, } =20 static -int ceph_process_folio_batch(struct address_space *mapping, - struct writeback_control *wbc, - struct ceph_writeback_ctl *ceph_wbc) +void ceph_process_folio_batch(struct address_space *mapping, + struct writeback_control *wbc, + struct ceph_writeback_ctl *ceph_wbc) { struct inode *inode =3D mapping->host; struct ceph_fs_client *fsc =3D ceph_inode_to_fs_client(inode); struct ceph_client *cl =3D fsc->client; struct folio *folio =3D NULL; unsigned i; - int rc =3D 0; + int rc; =20 for (i =3D 0; can_next_page_be_processed(ceph_wbc, i); i++) { folio =3D ceph_wbc->fbatch.folios[i]; @@ -1322,12 +1322,10 @@ int ceph_process_folio_batch(struct address_space *= mapping, rc =3D ceph_check_page_before_write(mapping, wbc, ceph_wbc, folio); if (rc =3D=3D -ENODATA) { - rc =3D 0; folio_unlock(folio); ceph_wbc->fbatch.folios[i] =3D NULL; continue; } else if (rc =3D=3D -E2BIG) { - rc =3D 0; folio_unlock(folio); ceph_wbc->fbatch.folios[i] =3D NULL; break; @@ -1369,7 +1367,6 @@ int ceph_process_folio_batch(struct address_space *ma= pping, rc =3D move_dirty_folio_in_page_array(mapping, wbc, ceph_wbc, folio); if (rc) { - rc =3D 0; folio_redirty_for_writepage(wbc, folio); folio_unlock(folio); break; @@ -1380,8 +1377,6 @@ int ceph_process_folio_batch(struct address_space *ma= pping, } =20 ceph_wbc->processed_in_fbatch =3D i; - - return rc; } =20 static inline @@ -1685,10 +1680,8 @@ static int ceph_writepages_start(struct address_spac= e *mapping, break; =20 process_folio_batch: - rc =3D ceph_process_folio_batch(mapping, wbc, &ceph_wbc); + ceph_process_folio_batch(mapping, wbc, &ceph_wbc); ceph_shift_unused_folios_left(&ceph_wbc.fbatch); - if (rc) - goto release_folios; =20 /* did we get anything? */ if (!ceph_wbc.locked_pages) --=20 2.51.2