git: acdc59f0924a - stable/13 - ext2fs: 'struct ufid': Re-order fields and unpack

The branch stable/13 has been updated by olce:

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

commit acdc59f0924aaddfa321741af05e08d2a6715d1a
Author:     Olivier Certner <olce@FreeBSD.org>
AuthorDate: 2024-12-06 16:37:56 +0000
Commit:     Olivier Certner <olce@FreeBSD.org>
CommitDate: 2025-01-17 13:59:53 +0000

    ext2fs: 'struct ufid': Re-order fields and unpack
    
    Re-ordering the fields suppresses the trailing padding which was causing
    the structure to overflow 'struct fid'.
    
    While here, re-indent in a more visually pleasing way.
    
    Reviewed by:    rmacklem, emaste, markj
    Approved by:    markj (mentor)
    MFC after:      5 days
    Differential Revision:  https://reviews.freebsd.org/D47955
    
    (cherry picked from commit 8ae6247aa966989412bd75fc7c26728690b9e944)
    
    Sponsored by:   The FreeBSD Foundation
---
 sys/fs/ext2fs/inode.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sys/fs/ext2fs/inode.h b/sys/fs/ext2fs/inode.h
index c29a64be12e0..225a8b0d0901 100644
--- a/sys/fs/ext2fs/inode.h
+++ b/sys/fs/ext2fs/inode.h
@@ -185,11 +185,11 @@ struct indir {
 
 /* This overlays the fid structure (see mount.h). */
 struct ufid {
-	uint16_t ufid_len;		/* Length of structure. */
-	uint16_t ufid_pad;		/* Force 32-bit alignment. */
-	ino_t	ufid_ino;		/* File number (ino). */
-	uint32_t ufid_gen;		/* Generation number. */
-} __packed;
+	uint16_t	ufid_len;	/* Length of structure. */
+	uint16_t	ufid_pad;	/* Force 32-bit alignment. */
+	uint32_t	ufid_gen;	/* Generation number. */
+	ino_t		ufid_ino;	/* File number (ino). */
+};
 #endif	/* _KERNEL */
 
 #endif	/* !_FS_EXT2FS_INODE_H_ */