From nobody Wed Sep 27 16:00:51 2023 X-Original-To: dev-commits-src-main@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 4RwhD35T6dz4vd1L; Wed, 27 Sep 2023 16:00: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RwhD34KlHz3Lmr; Wed, 27 Sep 2023 16:00:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695830451; 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=o1Ma15l8y2Hb7LVthSo3y7mUO7drDdtmr20mrFRJOzo=; b=cIWmlbyat0TtN9e2JW9XvMtgv0naHPNiJIMf/lSGLy+5R47iPOesTyub0/IKGNMl1+gpVu RK3kZc0BGwV5IuR48CEFIXSt4Ir+c2VJY7D+s2ldjfM41O2tdCKowhgvQZO2QFqGJBvqWt m0VipZfMkbOT2pRiJAHOuvg/CCm/wuKc9zOSDzH6IEftbj7L7Fzvwk6A3bRvQy6ZlJ0qC6 A9OdBwC5oJW1z7LTARyI4RK7xaHE2M+rflgTYfrcoYozRWa9lPfhfcjWEqyk0rohVNUn1v H9QJtePIF2B5FGvE66c39rxrhoLGXwLwfcSNK1OHo8f2PqTIUbLnDBkic0RkFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695830451; a=rsa-sha256; cv=none; b=IFzSskpjbBw4veI6s7YhpFJL5WKOdof6Kd+gNeZM9kxpOJVIX7hyjyyQDTFQuaQ88Kjp5b RFjY5DWO3qbc5QlSITas06TB3Qyg9pYZoFgjvL1iQ+c/n9iNGFj8PNDQrfORWCW30noi+0 PWTEzna3MycL9nFzzuvCZLidXrKP4dfS7AJCQ1Lj9qdPPZ0tr60nJm4n1qrX24Yb6YVyPq PqG9rrM52aFAVLwDScVJnT7ylxGof37bRyrLbC5WEpYOSWoJJbqV5L/a+1+JTln+cFkmw6 5tEx6mA2uzutXbs8IaycHezw1cS8jVbQM9TvSnf8+KNgLMIgCVD9Vn1bgh6esg== 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=1695830451; 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=o1Ma15l8y2Hb7LVthSo3y7mUO7drDdtmr20mrFRJOzo=; b=qbJmVuRv9G3iwjbRmcXXUfcm0audTgbY+RKheLYZccW+FtAUYHNFLTa89MCcoc7wxWy/XG cf9TzDLvJGhLNiEtIM61iZR54VW4vhtDu8gStaCno/TXbjq4+CYDs0fUnDuylXTDsjjTrU lP6/4Y1NOXyxLE6Doem04UhFMZaCF9UZKm/tAU+2moN2/y3ksBdAeyyXRflcUBw/4XpA/v nB4lFonMw8Nmn/exLWQtjzfqFrhfUtuQhGZGrUsaOdA66UPNuRVsWRGrQ173fqchUDnkeI x5TggF/RePQnyWzb9db/NplwObjBYz/Kb4prk7QotAwNP18ejmOGuqDTNiOL7Q== 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 4RwhD33N7pzlNN; Wed, 27 Sep 2023 16:00:51 +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 38RG0pEQ036452; Wed, 27 Sep 2023 16:00:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38RG0pUO036449; Wed, 27 Sep 2023 16:00:51 GMT (envelope-from git) Date: Wed, 27 Sep 2023 16:00:51 GMT Message-Id: <202309271600.38RG0pUO036449@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 46402fd21631 - main - makefs/zfs: Set the objset block pointer fill field correctly List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 46402fd21631b7d4686f8c341d92db6bcb190e5d Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=46402fd21631b7d4686f8c341d92db6bcb190e5d commit 46402fd21631b7d4686f8c341d92db6bcb190e5d Author: Mark Johnston AuthorDate: 2023-09-27 15:56:33 +0000 Commit: Mark Johnston CommitDate: 2023-09-27 16:00:00 +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. Reported by: mav MFC after: 1 week Sponsored by: The FreeBSD Foundation --- 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