From nobody Tue May 06 16:58:34 2025 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 4ZsPjl5H45z5v5w2; Tue, 06 May 2025 16:58:35 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZsPjk6JHRz3WdD; Tue, 06 May 2025 16:58:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746550714; 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=juEfLfbRnPLy3QVVvrIsv86z90jTuq7TC7mgMUvsK3U=; b=HQ7BoUj1RTbD8aOhURIclcfyqRuw3FPoK5btIp8aWoVd4Uk/2LUn7vEyX+kyWqd/l+18fz xwqT0dhinP+8fYjTo+76DOiBxYr87nQfufA9LiWYkjDSoJ6+d23i5KRk9tCXxVHe8G2gNV /64X55G7Mg+gZpjBz0Z5782ZHxvK9ir8j0PVew9LVI6ic0zp1AmaPlpighOnjjwHAqhJtn 3Sq6fHyZMIaifK+N90RqUDlGw4qEkuB3HdFYRCqda4gzfcn61GZGcPv6QzoW2RXV1yg79r WXtq1XLjkq5cMuWkP+9Y4APfjCnz+I9OD9SKDbnZFQmR2pWYVSIwu3e9gJK8DQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746550714; 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=juEfLfbRnPLy3QVVvrIsv86z90jTuq7TC7mgMUvsK3U=; b=B+6XqUfsvxocW7A5CQHHN4QmcQoD8nOIf9TtatT92XDagxn2d/CTByTBM1pkr4znxfg5sT 6CtT0i31m/fmgTi5x65aV6bZH3WohhqCvxiMDNjC4BYqAMot9Ilgi47ZUZloWjem1o+CZV 3Rg2ZIfvY6Gv4ZDEyP7A1bCRhWOVxtqUeE/2i8CfIoJWDS+xDP/7dhTvkklAC3ce5n+H+s dzyqQnPfcv3pM5ZqOamkTnTk6b7xpWSx4kr8AIWqstXoHtXwdpx9MqY4pENKTDrP09rdJV wyyMkDrfaoDmfez+H+BhmJIv0B1FxJ1WlT9Xll5s8VqA925Isc6mpRFFg5StgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746550714; a=rsa-sha256; cv=none; b=XAM3A1Lgz9X/E27usXUXL4h7nz5/33Qa5SNNuh3xPLMQeN/UntRBKdHXp6aOlWC/N72ncy oFETXfiHSwlF+U78RWai3Q/o9KknPVa6e5soSzMIgfkdLuvfXO0T2bcaVq5DZtUGPRmCDE r+T04MNTWY527k2AxjV+kuIfsFVGQYE2ZBqApFfiqCUUkdCdMldoV2CHaPNB9WM4CbMBmU AbB4B7nlSysHvKqE5imUs4BTV5gK5D4OtGcls0bOu2sqJb1wmuTTVM/euWcnHlI3BA21Bg ErISXesO0n6rYMuu4moSHzAsXjmaxr6GDst5iSMhHlLFsqv9sgm9Ip/dmXc+Sw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ZsPjk5RQVz17V8; Tue, 06 May 2025 16:58:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 546GwYxB051654; Tue, 6 May 2025 16:58:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 546GwY4P051651; Tue, 6 May 2025 16:58:34 GMT (envelope-from git) Date: Tue, 6 May 2025 16:58:34 GMT Message-Id: <202505061658.546GwY4P051651@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: c49043eacb14 - main - makefs: Support st_flags even on Linux 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c49043eacb14c951b0675eb4d37b81d4b02b949f Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=c49043eacb14c951b0675eb4d37b81d4b02b949f commit c49043eacb14c951b0675eb4d37b81d4b02b949f Author: Jessica Clarke AuthorDate: 2025-05-06 16:58:09 +0000 Commit: Jessica Clarke CommitDate: 2025-05-06 16:58:09 +0000 makefs: Support st_flags even on Linux Linux's struct stat does not have an st_flags member, but we still want to be able to create FreeBSD disk images with non-zero st_flags. Add a replacement member to struct fsinode to store it on Linux. Note that we add a fallback definition of HAVE_STRUCT_STAT_ST_FLAGS for makefs.h since etdump reaches into makefs and won't have it defined in its CFLAGS like makefs itself does, and on FreeBSD we don't provide an nbtool_config.h. Note also that strtofflags is currently a stub on Linux so this doesn't yet properly mirror the mtree, but that will change in a future commit. Reviewed by: emaste, markj Differential Revision: https://reviews.freebsd.org/D50078 --- usr.sbin/makefs/ffs.c | 8 ++------ usr.sbin/makefs/makefs.h | 15 +++++++++++++++ usr.sbin/makefs/mtree.c | 6 ++---- usr.sbin/makefs/walk.c | 6 ++---- 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/usr.sbin/makefs/ffs.c b/usr.sbin/makefs/ffs.c index aa5574c5201f..34a0f8a67497 100644 --- a/usr.sbin/makefs/ffs.c +++ b/usr.sbin/makefs/ffs.c @@ -685,9 +685,7 @@ ffs_build_dinode1(struct ufs1_dinode *dinp, dirbuf_t *dbufp, fsnode *cur, dinp->di_mode = cur->inode->st.st_mode; dinp->di_nlink = cur->inode->nlink; dinp->di_size = cur->inode->st.st_size; -#if HAVE_STRUCT_STAT_ST_FLAGS - dinp->di_flags = cur->inode->st.st_flags; -#endif + dinp->di_flags = FSINODE_ST_FLAGS(*cur->inode); dinp->di_gen = random(); dinp->di_uid = cur->inode->st.st_uid; dinp->di_gid = cur->inode->st.st_gid; @@ -733,9 +731,7 @@ ffs_build_dinode2(struct ufs2_dinode *dinp, dirbuf_t *dbufp, fsnode *cur, dinp->di_mode = cur->inode->st.st_mode; dinp->di_nlink = cur->inode->nlink; dinp->di_size = cur->inode->st.st_size; -#if HAVE_STRUCT_STAT_ST_FLAGS - dinp->di_flags = cur->inode->st.st_flags; -#endif + dinp->di_flags = FSINODE_ST_FLAGS(*cur->inode); dinp->di_gen = random(); dinp->di_uid = cur->inode->st.st_uid; dinp->di_gid = cur->inode->st.st_gid; diff --git a/usr.sbin/makefs/makefs.h b/usr.sbin/makefs/makefs.h index db0addc4bc94..62c7e430a00c 100644 --- a/usr.sbin/makefs/makefs.h +++ b/usr.sbin/makefs/makefs.h @@ -40,6 +40,12 @@ #ifndef _MAKEFS_H #define _MAKEFS_H +#if HAVE_NBTOOL_CONFIG_H +#include "nbtool_config.h" +#else +#define HAVE_STRUCT_STAT_ST_FLAGS 1 +#endif + #include #include @@ -85,8 +91,17 @@ typedef struct { enum fi_flags flags; /* flags used by fs specific code */ void *param; /* for use by individual fs impls */ struct stat st; /* stat entry */ +#if !HAVE_STRUCT_STAT_ST_FLAGS + uint32_t st_flags; /* stand-in for st.st_flags */ +#endif } fsinode; +#if HAVE_STRUCT_STAT_ST_FLAGS +#define FSINODE_ST_FLAGS(inode) (inode).st.st_flags +#else +#define FSINODE_ST_FLAGS(inode) (inode).st_flags +#endif + typedef struct _fsnode { struct _fsnode *parent; /* parent (NULL if root) */ struct _fsnode *child; /* child (if type == S_IFDIR) */ diff --git a/usr.sbin/makefs/mtree.c b/usr.sbin/makefs/mtree.c index fddc32b85322..83e207b07402 100644 --- a/usr.sbin/makefs/mtree.c +++ b/usr.sbin/makefs/mtree.c @@ -533,13 +533,11 @@ read_mtree_keywords(FILE *fp, fsnode *node) break; } flset = flclr = 0; -#if HAVE_STRUCT_STAT_ST_FLAGS if (!strtofflags(&value, &flset, &flclr)) { - st->st_flags &= ~flclr; - st->st_flags |= flset; + FSINODE_ST_FLAGS(*node->inode) &= ~flclr; + FSINODE_ST_FLAGS(*node->inode) |= flset; } else error = errno; -#endif } else error = ENOSYS; break; diff --git a/usr.sbin/makefs/walk.c b/usr.sbin/makefs/walk.c index fe1fe8df80db..b2afa9e78094 100644 --- a/usr.sbin/makefs/walk.c +++ b/usr.sbin/makefs/walk.c @@ -530,14 +530,12 @@ apply_specentry(const char *dir, NODE *specnode, fsnode *dirnode) dirnode->inode->st.st_uid, specnode->st_uid); dirnode->inode->st.st_uid = specnode->st_uid; } -#if HAVE_STRUCT_STAT_ST_FLAGS if (specnode->flags & F_FLAGS) { ASEPRINT("flags", "%#lX", - (unsigned long)dirnode->inode->st.st_flags, + (unsigned long)FSINODE_ST_FLAGS(*dirnode->inode), (unsigned long)specnode->st_flags); - dirnode->inode->st.st_flags = specnode->st_flags; + FSINODE_ST_FLAGS(*dirnode->inode) = specnode->st_flags; } -#endif /* if (specnode->flags & F_DEV) { ASEPRINT("rdev", "%#llx", (unsigned long long)dirnode->inode->st.st_rdev,