From nobody Wed Oct 22 16:59:51 2025 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 4csFlD0tPmz6CrvB; Wed, 22 Oct 2025 16:59:52 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csFlD0K6dz3cDW; Wed, 22 Oct 2025 16:59:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761152392; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5z/TeMl/GkFD638EmK1j2o1erBUlnyLMJqxxcDo5IO4=; b=fcOc+63F3J5m2R2lI6Iogi9m72IQBERU8KAtoXwgdvFsDYLvxalLjiv9qKonkPrBvI+HSn WhU6LrR5f9M1W1+T8YL2NdyNLU3hDbOZFlFR8a5Px3CCwQP5gJALQhdKuPByP1lwN1G/Th //HbIJfMvjXBHxDEsajMHNldurT1jaU2JyUmFaE8Ue2DFNZVILkNZPePEmj5xolqJZ39tQ fViFzVwBSgnG/ijvMdGnqG92S7CTw4TvGQJGjqtIXrIgyi/OP44iRxL0CTXRmp3Llkg/Th A5DxWY+PHEzEC29gUXAwcQAegcihy5Z89bAn+UuD9ZELbLGA0bbVor67bwto0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761152392; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5z/TeMl/GkFD638EmK1j2o1erBUlnyLMJqxxcDo5IO4=; b=qVoVafxDebeDEJAfbBGEixDxZHlR4+SLm3k8OoRzC6ITBfsyLriDAJDSs1Z1tbG+UvwUuu ID2xJxVondc6n5VT1X05fbvk3P0PWspE3x2k9vPVcl7g905mIMr+nEXdmuizcAhGqgk0YP +KcuEaasp/t5W/iv2dumZvUfpS0t3gIkSuhshbiwSgHjG5HK2TteolvCzlPoYO9wUmUxZx 0R7kCZa2TRdcLOG/6B4H9dFAiWCgZsUyid15QP3VDKkZqO/MKbDEsplNG77L2DxgOEmZ1h jRvbF1w26ejYX0FF0MYtu3VTqVCOeL6E3g6TdYsv9S2JhhZ6/DOgel4olQfp4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761152392; a=rsa-sha256; cv=none; b=ne/RSKdrPlNaW53vmTyuEYTEpJJP2ZaTLsCbgSMGYN7K0VqRXJVYaWppWx5g4EWE3ZMICr BumO+V5yEKqW5fAJCYF/NchAH4IwwzC6fqSYIqXcSI66i0yLLe6Y2LVGxV6Gq8Rkj9P7AJ xphjDocpJpahOB1dQoXyGikGe3e7GGlXF8qPlHydLwY32vxAzrF5dS4jK07T1AniMEb5MV HktBJRYzzK1RzaJ3GuxO8yuVAFmMCm+JHC96XdEDLod2r3Frvom09O3ITk42ijlWh3cW/D 53GW9vBMn7pymAQdLSw5bEbAInkOYfHeeuS/7gkzbg7l58xv0N8pKBZIw/wo9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csFlC6x9Zzdc9; Wed, 22 Oct 2025 16:59:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MGxp0q054768; Wed, 22 Oct 2025 16:59:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MGxpsK054765; Wed, 22 Oct 2025 16:59:51 GMT (envelope-from git) Date: Wed, 22 Oct 2025 16:59:51 GMT Message-Id: <202510221659.59MGxpsK054765@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Popov Subject: git: 62aef3f73f38 - main - 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: arrowd X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 62aef3f73f38db9fb68bffc12cc8900fecd58f0e Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/src/commit/?id=62aef3f73f38db9fb68bffc12cc8900fecd58f0e commit 62aef3f73f38db9fb68bffc12cc8900fecd58f0e Author: Gleb Popov AuthorDate: 2025-07-11 07:42:09 +0000 Commit: Gleb Popov CommitDate: 2025-10-22 16:59:21 +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 --- 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;