From nobody Thu Sep 24 15:55:08 2026 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 4hrJM1089Qz6sr8P for ; Thu, 24 Sep 2026 15:55:09 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hrJM06bxmz4WD7 for ; Thu, 24 Sep 2026 15:55:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790265308; 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=+EIjCe5r8IkDZd44Cy+rICnitsn4Juof+bUFgLm8lLM=; b=CXgq9ZmKvhyqFoSJdIfvcK5gRt3rvMbpveSgwhIdeFY6VWrGM9XdsOjDQ0quea6PW1WAdA e+/Pylnmdan4VyEC0Z/J65r7HwWW1Oo771nZOj4BKFOirwrUX2tNLRzyolDyPB11vxPQVK mV9ZlSzPHcXbteetqgnhH2LO11/OsCwIetwjdvouaKkh0m5K82UvTjkPm3TTV9DREswoA3 nKlRnGMQnlmZxFVpoGp4zNPURW6yk9P4LzDsYsUCYx0EnvvktUe5W5xS+/cSi97oFqS7YN xZ8Y58kZs0fMSCuLHKqJYr23xPBhrkAMptbjgilrsS9teqpyW6I2yU5vmmIRlQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790265308; b=SOtEiAxC5h+BxeHu5UHxMsxxiIKBcnkpW3Kv9Df6K6i769/SLqTJTnQ0cCQmbeKIPBoqST QUmVo1OpBA9WUY4kNuZbcgkGH3co1p7z1gE7oGmlB+fnAnEj0/jqTovsjssfGGQzrre+fl nTdHtmnVpun4X0yv1XA6ttTVH8tdUBiNVRU69RthVbnFbjCiUyOa6yBaoyi5anasyYNwEs IMfI3A/auZ9u9BRHwpZ1/AfUhyNp8itrvPNNFEw8+Jjwt7eRAaL/WXuLGqzfPamhTpgP0J iYQdx5eQCO/EZTy8dgUpk0kAvcHJ4t1Wxm8IAw154xUOB/6M+3OF5n7CiAgjcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790265308; 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=+EIjCe5r8IkDZd44Cy+rICnitsn4Juof+bUFgLm8lLM=; b=lN9cX2aQ1RVfvvq+NXXMJi9IztpWRv4xQTi0PJj0ngvBQH0maDDEBXwUInvSkJ/+pRI+w0 EYNQY+GG5kNfWbEJ+Xw3eXVvWEj226kzcM5Tll3DOAcJ0/w2oFWEApZCttPM3jDj6qS2ZQ O11GdekIGnp6PNv87xZRFPfh5+L8VLDZ64CHjQL7ektimctH9DedzQIwhNGC4lBjz6fASx 66tjh5OHenmf0Jp8uZyik0YOkFphXcniqCMPUUi6svSn66OUZ2pQhboYldjqMJ0m2xp84O rtm6RCe8sXRxY8T1Oezrcn12/VEHpVFHHKzHl0eGKNL2gpRnCuNQfzlD0U3SZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hrJM05hCSzVmm for ; Thu, 24 Sep 2026 15:55:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41be2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 24 Sep 2026 15:55:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 884b961c74bd - main - makefs: Make target filesystem inodes 64 bits 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 884b961c74bdadb7d8c97a7763e3110e803c69be Auto-Submitted: auto-generated Date: Thu, 24 Sep 2026 15:55:08 +0000 Message-Id: <6ab547dc.41be2.5104dfc6@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=884b961c74bdadb7d8c97a7763e3110e803c69be commit 884b961c74bdadb7d8c97a7763e3110e803c69be Author: Ed Maste AuthorDate: 2025-05-28 13:09:17 +0000 Commit: Ed Maste CommitDate: 2026-09-24 15:54:40 +0000 makefs: Make target filesystem inodes 64 bits Obtained from: NetBSD 2501d4dfda92, 7022656d8ab2 --- usr.sbin/makefs/ffs.c | 4 ++-- usr.sbin/makefs/makefs.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/makefs/ffs.c b/usr.sbin/makefs/ffs.c index ed94abb7504f..ba5329bcab49 100644 --- a/usr.sbin/makefs/ffs.c +++ b/usr.sbin/makefs/ffs.c @@ -916,8 +916,8 @@ ffs_populate_dir(const char *dir, fsnode *root, fsinfo_t *fsopts) root, fsopts); if (debug & DEBUG_FS_POPULATE_NODE) { - printf("ffs_populate_dir: writing ino %d, %s", - cur->inode->ino, inode_type(cur->type)); + printf("ffs_populate_dir: writing ino %lld, %s", + (long long)cur->inode->ino, inode_type(cur->type)); if (cur->inode->nlink > 1) printf(", nlink %d", cur->inode->nlink); putchar('\n'); diff --git a/usr.sbin/makefs/makefs.h b/usr.sbin/makefs/makefs.h index 3cd56a036670..da31edbef4f0 100644 --- a/usr.sbin/makefs/makefs.h +++ b/usr.sbin/makefs/makefs.h @@ -86,7 +86,7 @@ enum fi_flags { }; typedef struct { - uint32_t ino; /* inode number used on target fs */ + uint64_t ino; /* inode number used on target fs */ uint32_t nlink; /* number of links to this entry */ enum fi_flags flags; /* flags used by fs specific code */ void *param; /* for use by individual fs impls */