From nobody Sat May 23 07:13:50 2026 X-Original-To: dev-commits-src-branches@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 4gMtfl2qkDz6fgCN for ; Sat, 23 May 2026 07:13:51 +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 4gMtfk50TCz3t0S for ; Sat, 23 May 2026 07:13:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779520430; 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=7ZWEjalZ44cCNK/gk4JmzHBWgqKs1K2uS+AqNPD4Zzo=; b=BXfV3DrEX6oT4RRwVcJ3Lt0v4Ev89MYsyTm4jc4Ngi3N0X7Yvbc1+h2Leieqy+ejkcA494 Q/s/a55mXf1a2RTdjtNe46YNF/3/6YRT1v5EpVu538qM4yovCfGbjN9RqkmJSF0QTxHT5I JJNHkqUIgphMbNbU21kGUfi/kHeNz7SzhTtGxr7PQT6x287UrXZN0ub7KDOVWI5IN1ZXL0 g/xtkaf66mngQvo/+kE0cDm9FuVZPxcZsMGtLrgstVyYbO3/ZfTvJrZnT7H38kMzEuvhWM mr4ZZQieIo+ZcIFje5HQhFfb3bnotldwNN8ivMrFohXIaTQefecVvNYBZL2TNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779520430; a=rsa-sha256; cv=none; b=x4EVXrCY1q7giq9J6k0Dx4FLNL9kGpNN70kFqq305tEY9jCsa1IbVbfKzXmUgFSG0K7yIy oWs8zOZyiDT3Pf285+qEg+8SSGIuRAGJ91NlsGk2UH8TRrwFT5OTZVQPv/VlrqCXEqZtuw pGZw3UPlUq5K101bAp8Y1GwXJNPi+jMNWc21RB4fP/6SK35unmnA3bnHA+5Aem8CnNHip6 AtobfRSw7vvSBaERhBIQP7insY0pVrg0kBfUao2w6UU5xxkAmFhz5BvciIrurOM1/poNaq QidM3DDbqsU54HMoXMgeCvn8QURkVy/qqFijIC5Zr5SG8Jzy8jEzcorMOJ7i7g== 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=1779520430; 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=7ZWEjalZ44cCNK/gk4JmzHBWgqKs1K2uS+AqNPD4Zzo=; b=HCi7yI2ILSvPIrgDyEOOXp4cRSAyZi1swQLxd/dG1p9W1V43g/dYpAWou5OaLSBfJ4MlJz mfeO3kreAsILMw8mFmtZBt+EBg6I8CoXFSFlt8KZT/Q2tINXB3LceR9SVIYGmUxzeZF+1W 0tZ9tssUykJQz+2Uy0buf0qgEzX8Mv+jg7/mRov6ihVZzkxoJIHDtL1k+Ow81yY+DGIcEd MT2sSRpl3oxORfL2NulsDkNWAF9UKiQKL2h4O8Wjq1cer3Az/yKFfeSoQrt9CAFP3kZ2S0 fJVPlSKlHfGWmGg2VZqivBMgmSd+7ZCMBhRXSGooLRzWT6p4ZZIgfwa1bFNdBg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gMtfk4GHTzxVQ for ; Sat, 23 May 2026 07:13:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e648 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 23 May 2026 07:13:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 3564e33b6099 - stable/15 - ufs: ufs_bmap_seekdata() needs mapped buffer for scan List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: 3564e33b6099fcdfce4371fcf51c7f462823e012 Auto-Submitted: auto-generated Date: Sat, 23 May 2026 07:13:50 +0000 Message-Id: <6a1153ae.3e648.1b177d74@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3564e33b6099fcdfce4371fcf51c7f462823e012 commit 3564e33b6099fcdfce4371fcf51c7f462823e012 Author: Konstantin Belousov AuthorDate: 2026-05-17 00:09:21 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-23 06:56:13 +0000 ufs: ufs_bmap_seekdata() needs mapped buffer for scan PR: 295348 (cherry picked from commit 8ad8643a66735d28dac53a772856c94ca65b2bf3) --- 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 030cf3055477..1194820e6b07 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);