The branch main has been updated by emaste:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=884b961c74bdadb7d8c97a7763e3110e803c69be

commit 884b961c74bdadb7d8c97a7763e3110e803c69be
Author:     Ed Maste <[email protected]>
AuthorDate: 2025-05-28 13:09:17 +0000
Commit:     Ed Maste <[email protected]>
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 */

Reply via email to