From nobody Wed Oct 4 13:43:50 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 4S0wrk2hXPz4vxc0; Wed, 4 Oct 2023 13:43:50 +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 4S0wrk28f9z3ZPM; Wed, 4 Oct 2023 13:43:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696427030; 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=tWJ7qYG6mpGD6Qj7Tb6r5O0R8YAj/Tkhxl6k55z+j8A=; b=beNdBsh1AInZrQgPGeoT76ZE6VuvbfPF4fraRRm97lD+h1qosHvTIrPLSUheiQ6mzaBZwC zpnWMp9gFadXuKzAcw5aWXkWbWYWTQzD8wApnr24ii5UO13/v54eJEBbc3LcjZG3dzLAYL UiqBfmDog6bS89O/4QJjRoE5uAvzUiLwog8PSTOADaTTgFGpLrHpQo3IuARvDRerR6tk6e YZDDwL69wA4DOx3Kd5A3j0+X2ig8he8c8u9pGtqKLS3nooYqjwqdWbCrHuZ4yllf0DgvoQ zP33olcMKO4bh/h+x0UsQL/SNNUNhsX4RW/q/Uf6j845lKuEx0Vc3x+1yZ5l/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696427030; a=rsa-sha256; cv=none; b=dWD/T99w/yYT/odmWlKPhl6XTW/EUhEOv8E34tdnHBlSzT/7EvJMpBr4XLhoB3DfXFUcga e03obhJg74JO9/UW1Lj+qASXGjDIrTmsLa1TJCC5wRYIVaAvGeJ8pMgUz9MrDMCvVzP15N IxrpjMXoG8dLmprpifY8Hr9eTxM6NwPF9IC+rwxMpH2OGpYfWz2QFi21BcA8jZCHCiR8wn nniswF2CWvbk6HZYfLasBPS++A0y08L9OKoPVN4MrM7PEYrpmNcaXKxkpJTGlwjlAUYiZ+ w9IBMw2GqlzMDc5or5k05hNhyE9hfR7yhoQtXmcjrcGfxT0IA7J5yCktrvzk9A== 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=1696427030; 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=tWJ7qYG6mpGD6Qj7Tb6r5O0R8YAj/Tkhxl6k55z+j8A=; b=lfrHN44qJqFP2kWdK+7jhWQkicWauFmWhV8qutazN8X/HiexmPmVnVt9xdZNCpOHQhaBdb feZIaRApqGo7wIFncswsakiO9nUczJHgf0McBnAddSSBGRdSmkuwaj8zRO7qQN1WvtAB0E FWx8g7b/onXaw7QmBxLFTZtSWdratztdKPPmBeCZPsYhuVCJiohNhwDujv2iarEqDDnh1X btdXEjprvW1WmYMPPwVg8Ox4OSUf9cy3sL9c8dSLbtZn9Du4620lL4IE6DE2vvhQPFmC6M Jt1lklpQmwwI8WH6eRAjiYgU9YVq5T0M1iCHPvD2xJwqCmxPDon4hr6wpQQhHQ== 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 4S0wrk1C3qzfxJ; Wed, 4 Oct 2023 13:43:50 +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 394DhoE6020164; Wed, 4 Oct 2023 13:43:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 394DhoPq020161; Wed, 4 Oct 2023 13:43:50 GMT (envelope-from git) Date: Wed, 4 Oct 2023 13:43:50 GMT Message-Id: <202310041343.394DhoPq020161@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: ea5173e57255 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: ea5173e5725564da4b95a5b98410b8cd43520dab Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ea5173e5725564da4b95a5b98410b8cd43520dab commit ea5173e5725564da4b95a5b98410b8cd43520dab Author: Mark Johnston AuthorDate: 2023-09-27 15:56:33 +0000 Commit: Mark Johnston CommitDate: 2023-10-04 13:42:14 +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 (cherry picked from commit 46402fd21631b7d4686f8c341d92db6bcb190e5d) --- 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