From nobody Sun May 17 22:09:41 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 4gJZqH4Srdz6d7dh for ; Sun, 17 May 2026 22:09:47 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gJZqH1dmJz3mbD for ; Sun, 17 May 2026 22:09:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779055787; 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=VfNy3PzQn6xKr/RuR67KCroGt/D6vwEtP/qmmmz382A=; b=xf1P1ooeAr9WkKxhmjtGkwsXFAugVGbMNz6LHcWmYnO5q/aG0H6F1h6e0zze9wpx3hddX4 GQZD/SbJAlOIfV3rh9QkYfh7rT00PfKgzC7qlvkT7mhJkEXIs4nG5D9zGcCdk8hAfaYwjN Emhk+HfBqBQEe3D9Q6KrPEEwRHAqnPvCYtPUkSD2IcZXJ1HTSswKMhVZPLhSWo3Qdyxec9 7l1mHmnSfr/77UWEjgVEjfEUpqCRjb9ncujMsek6my1Mf617leoldr5TGookV26EJmcata O+4U5iDtkRP6bYDd9tZCRwfr8mDUK5dLZyJrt7v4A4oOvwG8XedSS92nxfTW7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779055787; a=rsa-sha256; cv=none; b=HfSOGDF+64n6/HjPDCL5iyeegA6ii0ok5bGenPmllx3jAOl6uwdbxSkQWDxNysthexykCg YSf59PCKqu68htOdZ3gGvFcspVIz8DaRQLmREsKk/5c4qgjSZmHchLibU4keGC1SVyidmA QAfIHlEbXjrpM0MhLPyaRJw+B0d6idhPcB6EVaJY/X2sKnYg+wxJwXaq3wWvH8TcD2l8Hx tnwJbcyx5YB+F8J098IVGXiGSgNo1trK4JLNn5o8U8A8/lfCeq1CxffA2t2gF+CZOeDWe0 sQAklLY0Om6tASPBr+VzmdEmSz5HDiWGrB2VEw7p6wQ2NWFYZfslJjW0G+rj2w== 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=1779055787; 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=VfNy3PzQn6xKr/RuR67KCroGt/D6vwEtP/qmmmz382A=; b=SWVtzWWiNsLK8fY9v7dW3SAhM8DPNKZe1tfXxfB7SOm/NpbTmTOlGfD36rZJ4eNpMlDKGl RtfP/d+rgHPLpyMDH59bn6nzhOgZ8OnHY55PXDEpMT2/59eKWh8CVmX/TISDeocYdl3Dr/ qUVYV1zniC3u00bVUAmopkiFA97kuSPTGBPZ7LFGW4UYIQHc9lf9tCO0qFeMhY9Hd2e5qg svj05leBvQRbSkMnIJZrAo96t/ew5DFHlh5xs8d/qLOhl0E/JjLa7fOtuvUXy66O+tHoZq Ip7xnU5GTARFobVcISMVnyM8LXR3C886wwJboZl03wHHZqBKISJoIJjOsd2NKQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gJZqH0kz5z10nv for ; Sun, 17 May 2026 22:09:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 425c7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 17 May 2026 22:09:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 8ad8643a6673 - main - ufs: ufs_bmap_seekdata() needs mapped buffer for scan 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8ad8643a66735d28dac53a772856c94ca65b2bf3 Auto-Submitted: auto-generated Date: Sun, 17 May 2026 22:09:41 +0000 Message-Id: <6a0a3ca5.425c7.6f2ddb32@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8ad8643a66735d28dac53a772856c94ca65b2bf3 commit 8ad8643a66735d28dac53a772856c94ca65b2bf3 Author: Konstantin Belousov AuthorDate: 2026-05-17 00:09:21 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-17 22:09:26 +0000 ufs: ufs_bmap_seekdata() needs mapped buffer for scan PR: 295348 Reported and tested by: Alastair Hogge Reviewed by: mckusick Fixes: bab04ddf1fd4 ("ufs: support unmapped bufs for indirect blocks in bmap") MFC after: 1 week Differential revision: https://reviews.freebsd.org/D57036 --- sys/ufs/ufs/ufs_bmap.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sys/ufs/ufs/ufs_bmap.c b/sys/ufs/ufs/ufs_bmap.c index edfcabb1a607..6b3e6f77427c 100644 --- a/sys/ufs/ufs/ufs_bmap.c +++ b/sys/ufs/ufs/ufs_bmap.c @@ -59,7 +59,8 @@ #include static ufs_lbn_t lbn_count(struct ufsmount *, int); -static int readindir(struct vnode *, ufs_lbn_t, ufs2_daddr_t, struct buf **); +static int readindir(struct vnode *, ufs_lbn_t, ufs2_daddr_t, bool, + struct buf **); static int ufs_bmap_use_unmapped = 1; @@ -104,6 +105,7 @@ static int readindir(struct vnode *vp, ufs_lbn_t lbn, ufs2_daddr_t daddr, + bool allow_unmapped, struct buf **bpp) { struct buf *bp; @@ -116,7 +118,8 @@ readindir(struct vnode *vp, ump = VFSTOUFS(mp); ip = VTOI(vp); - gbflags = !I_IS_UFS1(ip) && ufs_bmap_use_unmapped ? GB_UNMAPPED : 0; + gbflags = allow_unmapped && !I_IS_UFS1(ip) && + ufs_bmap_use_unmapped ? GB_UNMAPPED : 0; bp = getblk(vp, lbn, mp->mnt_stat.f_iosize, 0, 0, gbflags); if ((bp->b_flags & B_CACHE) == 0) { KASSERT(daddr != 0, @@ -291,7 +294,7 @@ ufs_bmaparray(struct vnode *vp, */ if (bp) bqrelse(bp); - error = readindir(vp, metalbn, daddr, &bp); + error = readindir(vp, metalbn, daddr, true, &bp); if (error != 0) return (error); @@ -525,7 +528,7 @@ ufs_bmap_seekdata(struct vnode *vp, off_t *offp) for (; daddr != 0 && num > 0; ap++, num--) { if (bp != NULL) bqrelse(bp); - error = readindir(vp, ap->in_lbn, daddr, &bp); + error = readindir(vp, ap->in_lbn, daddr, false, &bp); if (error != 0) return (error);