From nobody Thu Mar 26 15:08:18 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fhRwz3cdqz6RfPZ for ; Thu, 26 Mar 2026 15:08:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fhRwz1LwXz3mgP for ; Thu, 26 Mar 2026 15:08:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774537699; h=from:from: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:content-transfer-encoding; bh=pmqGeN/WaeS2cZtJFLzE1hIONNqlVdpbqtmqFk77Ecc=; b=xQuUjW9d05bwxvcsDd5lzjI8enO9TtfcqrNAVWrEmfTGgzkRe27wnP12FyP2Lor2k2Yyak rKbppEDgIRlsMKnHtNO+1y3EInJksa48JAiaEYsjIN29Qzh9VyuBCe/E95PFyrDusgPPM1 a2uoPdzGqYLabCJ+vq1wBfjyqAGqUb01hDMqFjo0qnfuLyqEtv3MXZGLJNN4PddVnoSYkj Z4fJNhrwhypHZ6t03uwiyVCN7J6Z3e0x//bjlhsRthfWbUTmYSMoL8V3l8949EqzhTK0Pi Js02DmnrQHYc5HKWGyuPLQLHsxL81VZXF7QcFb/B2Fab32urWJBxoTEiGVHcCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774537699; a=rsa-sha256; cv=none; b=PYxWqneJ+wCRdavgyZZyHnUGnKZjSosyTnHDNR9XZ+AzgMg1vV0duhyIfmCDN17SU+sjuk lUgV4FxK4vpo5WTp0sAMbS20/45CjDEhHncXOtdKShjnA5s4nolEji3Hb6iGcilndw6WZl PLTlbuiQMNp2VEnlmSpI971f92i+wKp3NlBcoACALUjSugKHg3jID8SsGEVwOvLNgVcDgO oFFUbsdNHjsA+cR4d0nnDVJ4b5dNAz1jznwWpKeludpT7Upn4ukI14SxgFX0Kw9WLzNmF8 r6okT+GfiWp5i8fPa14iZksjP38XHglBjRwyCFzWV55rpPED5yNqCLuuMLakuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774537699; h=from:from: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:content-transfer-encoding; bh=pmqGeN/WaeS2cZtJFLzE1hIONNqlVdpbqtmqFk77Ecc=; b=Rs2N4/TvjqcGtZ6VvlC490aeXr/3X7jC8x9faZkH8cqwsR1DHK2X6zEglQ5awFB+oMqT+F ZdTEFMtk/oPzAFHGC8MSB9OR5p663NEBpl2wRn07mOrTWsGJtd/tVE4irIt68pckL+YP/s DxES62DMm9oxNTB8TEHdkqi8tAJLwgh1o3BMk3NQwv7m1VIMyc7DKji3fFm9awKPYmTmZR q+tRp51ET/ZXwRlBJVAbChFupGS4Xy9hbDduclDZ2tpKsFiUYCoIMnQkcXye4Rvl5KgLKI PEN6wPNEFPGpBP6GF8bnv98/smAJZ1IaSqEK9tnNJQX7ZvUMozvSi+br9iD6iQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fhRwy6tSYzxmw for ; Thu, 26 Mar 2026 15:08:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21796 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 26 Mar 2026 15:08:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Gleb Popov From: Alan Somers Subject: git: 1ebccc3b0f68 - stable/15 - vfs_cluster.c: Do not propagate VOP_BMAP errors to the caller List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1ebccc3b0f68dccb2447a6f251e6fa409cb3b2eb Auto-Submitted: auto-generated Date: Thu, 26 Mar 2026 15:08:18 +0000 Message-Id: <69c54be2.21796.6df3eaca@gitrepo.freebsd.org> The branch stable/15 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=1ebccc3b0f68dccb2447a6f251e6fa409cb3b2eb commit 1ebccc3b0f68dccb2447a6f251e6fa409cb3b2eb Author: Gleb Popov AuthorDate: 2025-07-11 07:42:09 +0000 Commit: Alan Somers CommitDate: 2026-03-26 15:02:16 +0000 vfs_cluster.c: Do not propagate VOP_BMAP errors to the caller The code that makes this VOP_BMAP call tries to perform a read-ahead I/O operation. Failing to do that for any reason isn't fatal for `cluster_read()`, because we still can return some data to the caller. This change is consistent with other places within `cluster_read()`, where error returned by VOP_BMAP is not returned to the caller - see the `if (nblks > 1)` block above the changed lines and `if (reqbp)` at the end of the function. PR: 264196 Approved by: markj, kib Differential Revision: https://reviews.freebsd.org/D51254 (cherry picked from commit 62aef3f73f38db9fb68bffc12cc8900fecd58f0e) --- sys/kern/vfs_cluster.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c index 2e397b8e9e8f..b674313993c4 100644 --- a/sys/kern/vfs_cluster.c +++ b/sys/kern/vfs_cluster.c @@ -260,8 +260,10 @@ cluster_read(struct vnode *vp, u_quad_t filesize, daddr_t lblkno, long size, */ while (lblkno < (origblkno + maxra)) { error = VOP_BMAP(vp, lblkno, NULL, &blkno, &ncontig, NULL); - if (error) + if (error) { + error = 0; break; + } if (blkno == -1) break;