From nobody Thu Oct 5 15:10:19 2023 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 4S1Zk33TJgz4vjk4; Thu, 5 Oct 2023 15:10: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S1Zk32ygzz4XT1; Thu, 5 Oct 2023 15:10:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696518619; 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=EGuNG5EHDloGYOLzn0nvxRiboyjUakAbDelPw7Y++OI=; b=MntTJzv/jJ5s9JQsgwp94JA7qd74tfYhcGaE6i3j9B4XBwIAlq/sVoRv0XpL2adGV0pVOb m8qR+udNswkVVLcWU9VVEOWGmZ4RRk6qelfsw49dUN+kSFVRqhSuv5/owQLpTS8k51stEa T6lFRxuiPP9RnbieK4EoiafH+Yq3fYrGJ0VqVvihcZX8QesCZaSwgzOp/aDojIrE20MyMz Yu5SiHJz0S6tGzpxC33MA1imuDHKbG6stS/fVq1NSE2nH6rUbF145XXk5rhQEHnUYqTCeO 0ejqBUKSWbjMwGlUZ/yGbFUPX39YiFee5PETHwXPJwoLes2njKK4r4x3sb4hog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696518619; a=rsa-sha256; cv=none; b=ApjXSWFWWcq/bO4Oa2tQcWeWMfsB63Pt8vBS6907WFhpfEKWLxk8qjPk7m0X6sKs1XD/fq gPiRRn5jUM0yfOvctWIOLzo+MQz2RxMKUTikePEjZkT+YWC8Tav+YoGGX0BxP/jJj9B1KQ q7H7R/E+xiodFVV/lX/yY3GXdDrvavEdxpYu3JwSANpfZmTXbaOy/r23F1ickMEE/rEN4D ZCEKij4cXG+q3RIGzradBvaojEplVs0rf7y/Eu/mD9phRJITAcRLkSaM4PSVMZmfEVJWVp bWUvvLsXW9/LSLc9hl9m3+q7PLeAR4O+zudGxAcZLwKoTCAgG/YQiIw1p9vq4g== 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=1696518619; 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=EGuNG5EHDloGYOLzn0nvxRiboyjUakAbDelPw7Y++OI=; b=qVi9+/pnvqqOtH2xmhq0UMmmdn0kfAcqQZBpcRblmjqdS+B/g0lN8wi2LkDVTWtFy+8sAq 5tAspXto1eA8+z6e2qU7RR6nZBfIqDf20efGBKFhZWnoK5+ziGPvmjziwpk567MWpJz1PW /bU+vWpsr4iji3UAx5E3g1OgS+4UFmwJe7Lr15dC5WbWsP2XaObCfazCcl4D0teTC03nc6 /9wKQaeRekDr2xU7e+/hqA0C9LBddnUs02v9kQjnoyddJk14t9sfSLI7+yc/Hl+8lhl+uG +oVBzZW0ugVRdIdIRCtDZaIVKQwULUGUl3VKmWUerk4ZBkHqgsMROfYnirDVmQ== 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 4S1Zk322Dpz1PNR; Thu, 5 Oct 2023 15:10:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 395FAJPe071434; Thu, 5 Oct 2023 15:10:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 395FAJ7b071431; Thu, 5 Oct 2023 15:10:19 GMT (envelope-from git) Date: Thu, 5 Oct 2023 15:10:19 GMT Message-Id: <202310051510.395FAJ7b071431@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 7377d7440fcd - releng/14.0 - makefs/zfs: Set the objset block pointer fill field correctly 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 7377d7440fcd60fd58d6a4b51a61f1a7b921eae1 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7377d7440fcd60fd58d6a4b51a61f1a7b921eae1 commit 7377d7440fcd60fd58d6a4b51a61f1a7b921eae1 Author: Mark Johnston AuthorDate: 2023-09-27 15:56:33 +0000 Commit: Mark Johnston CommitDate: 2023-10-05 14:01:23 +0000 makefs/zfs: Set the objset block pointer fill field correctly It is supposed to contain the number of objects allocated from the set, excluding the meta dnode. Approved by: re (gjb) Reported by: mav MFC after: 1 week Sponsored by: The FreeBSD Foundation (cherry picked from commit 46402fd21631b7d4686f8c341d92db6bcb190e5d) (cherry picked from commit ea5173e5725564da4b95a5b98410b8cd43520dab) --- usr.sbin/makefs/zfs/objset.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/usr.sbin/makefs/zfs/objset.c b/usr.sbin/makefs/zfs/objset.c index 22277c150712..3e3dcdeced4b 100644 --- a/usr.sbin/makefs/zfs/objset.c +++ b/usr.sbin/makefs/zfs/objset.c @@ -121,6 +121,7 @@ _objset_write(zfs_opt_t *zfs, zfs_objset_t *os, struct dnode_cursor *c, STAILQ_FOREACH_SAFE(chunk, &os->dnodechunks, next, tmp) { unsigned int i; + assert(chunk->nextfree > 0); assert(chunk->nextfree <= os->dnodecount); assert(chunk->nextfree <= DNODES_PER_CHUNK); @@ -149,8 +150,8 @@ _objset_write(zfs_opt_t *zfs, zfs_objset_t *os, struct dnode_cursor *c, * Write the object set itself. The saved block pointer will be copied * into the referencing DSL dataset or the uberblocks. */ - vdev_pwrite_data(zfs, DMU_OT_OBJSET, ZIO_CHECKSUM_FLETCHER_4, 0, 1, - os->phys, os->osblksz, os->osloc, &os->osbp); + vdev_pwrite_data(zfs, DMU_OT_OBJSET, ZIO_CHECKSUM_FLETCHER_4, 0, + os->dnodecount - 1, os->phys, os->osblksz, os->osloc, &os->osbp); } void