From nobody Wed Oct 25 15:26:45 2023 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 4SFt7p0dzpz4xfLr; Wed, 25 Oct 2023 15:26:46 +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 4SFt7p0BTjz4TYw; Wed, 25 Oct 2023 15:26:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698247606; 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=PJbLu0zo+f3Frt+LCIIuHm2vCPydP/jd1GAuWj6qtaM=; b=mr0MHPWhNdVJrXmgXniWv1hTGga2++PsWKfDyyUl0YZ2mz9Zu2VzRB96yDKhj4k7DjWZiw S2jBHVxDgSd4pS9Bmx2Yto/qLsVcgmJnPZmleyW0JrfbobQU3hq6BY1q4rsGGB2qK7tlpV XtZ+zbLDWDdH2YjUmt4Hx2qnTcGkXfKH8TRWM5o2D/IfnxRczwNzc3ZvdoWd3RTQAxzikn snPNQD4ldsrUDfAdVBr0ZVIHKGI6sux8IyGyITQuWi83ENDLWKSF91+x1wXaZ2cZk81g4B C2YN9ekJOKZgGrzMvPMZ0f68/O5aksy3DzGYp3OdbTyIl71SpQsMDv8Vg6rFcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698247606; a=rsa-sha256; cv=none; b=kdQ/fHM2JkZYcFD2G/1tv4u8GyHCPaAsq0v9aFuRF55XRC3E6XS1GAeoQ/diH4FeWotNJc 3g+RJEMhxSGH6AcQagJBgi3Yq899cFknyCMJiH1ue+FgzlJ9X10Cr7+fs+HkskWaWIzi3L Q4aBu7g22NUHM9Z+b0M47rF7h+/qQAE7AVBkUEFz3k89qDLuWi5lXxDXx2eX+oLOqhG6hW SWbX+mxJvtbbzLxOHUXCiGrIrfno/kUKLULHJ8scgag+QaH8GxgZhnqlyQrqANMUuZMlwM D2uhGMQiQl2iYTop9lWkfeSPc6CjB+n2A/Wba9vMe8hjkP/edntZ984JbL6bGQ== 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=1698247606; 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=PJbLu0zo+f3Frt+LCIIuHm2vCPydP/jd1GAuWj6qtaM=; b=v8b5EpsZO+kIUIoqQdK2V5yYO9FVGDL7hwEj0XBlMeqUkLxb5dnJBWmzKAZdoOWJIGUyWZ LaQv9UEMN83UjVzKkpSYZbQeylWnOuScIrW1LmZqQ1m5M63W4Bf8P7UnU/derFYCUz/2Fa fzPHBRucabMjRNYUDom2hCJEe0bF6bMRLqhaJ2PUUNqcAqOlKrWfH3yNr64EHSoOn4bOpK ehYIdnPZvQ7MAXusQOoN84GSLN75F1242e50PUJOmZ7rcBNpjNMdVy8dPbWx3wkm95CKOs nu74HRnxDsV6e1fMjYNVPQkDfN+CrOVK7Hr5FmlSzjXV015Ml4K5yDDA06SwmQ== 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 4SFt7n6FNJz18Jn; Wed, 25 Oct 2023 15:26:45 +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 39PFQjmA072847; Wed, 25 Oct 2023 15:26:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39PFQjfQ072844; Wed, 25 Oct 2023 15:26:45 GMT (envelope-from git) Date: Wed, 25 Oct 2023 15:26:45 GMT Message-Id: <202310251526.39PFQjfQ072844@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: 2fe5f406dcc1 - stable/14 - makefs/zfs: Use unsigned integers for indirect block level counts 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 2fe5f406dcc15da2ce3c74fd43a8777102a9f191 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2fe5f406dcc15da2ce3c74fd43a8777102a9f191 commit 2fe5f406dcc15da2ce3c74fd43a8777102a9f191 Author: Mark Johnston AuthorDate: 2023-09-27 15:47:26 +0000 Commit: Mark Johnston CommitDate: 2023-10-25 15:24:43 +0000 makefs/zfs: Use unsigned integers for indirect block level counts No functional change intended. MFC after: 1 week Sponsored by: The FreeBSD Foundation (cherry picked from commit b5a2bf512dbe5bc8535e28e9f584a08444965426) --- usr.sbin/makefs/zfs.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/usr.sbin/makefs/zfs.c b/usr.sbin/makefs/zfs.c index 4d45926fb33f..db302fe1e760 100644 --- a/usr.sbin/makefs/zfs.c +++ b/usr.sbin/makefs/zfs.c @@ -673,7 +673,7 @@ dnode_cursor_init(zfs_opt_t *zfs, zfs_objset_t *os, dnode_phys_t *dnode, } static void -_dnode_cursor_flush(zfs_opt_t *zfs, struct dnode_cursor *c, int levels) +_dnode_cursor_flush(zfs_opt_t *zfs, struct dnode_cursor *c, unsigned int levels) { blkptr_t *bp, *pbp; void *buf; @@ -685,7 +685,7 @@ _dnode_cursor_flush(zfs_opt_t *zfs, struct dnode_cursor *c, int levels) blksz = MAXBLOCKSIZE; blkid = (c->dataoff / c->datablksz) / BLKPTR_PER_INDIR; - for (int level = 1; level <= levels; level++) { + for (unsigned int level = 1; level <= levels; level++) { buf = c->inddir[level - 1]; if (level == c->dnode->dn_nlevels - 1) { @@ -724,7 +724,7 @@ blkptr_t * dnode_cursor_next(zfs_opt_t *zfs, struct dnode_cursor *c, off_t off) { off_t blkid, l1id; - int levels; + unsigned int levels; if (c->dnode->dn_nlevels == 1) { assert(off < MAXBLOCKSIZE); @@ -753,8 +753,9 @@ dnode_cursor_next(zfs_opt_t *zfs, struct dnode_cursor *c, off_t off) void dnode_cursor_finish(zfs_opt_t *zfs, struct dnode_cursor *c) { - int levels; + unsigned int levels; + assert(c->dnode->dn_nlevels > 0); levels = c->dnode->dn_nlevels - 1; if (levels > 0) _dnode_cursor_flush(zfs, c, levels);