diff options
| author | Olivier Certner <olce@FreeBSD.org> | 2024-12-06 16:37:56 +0000 |
|---|---|---|
| committer | Olivier Certner <olce@FreeBSD.org> | 2024-12-13 14:04:50 +0000 |
| commit | 8ae6247aa966989412bd75fc7c26728690b9e944 (patch) | |
| tree | 0db69cb8feb5c73320d53d962a10713e47b3b0c6 | |
| parent | cf0ede720391de986e350f23229da21c13bc7e9d (diff) | |
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
| -rw-r--r-- | sys/fs/ext2fs/inode.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/fs/ext2fs/inode.h b/sys/fs/ext2fs/inode.h index 63102deb10b0..c45339bfde40 100644 --- a/sys/fs/ext2fs/inode.h +++ b/sys/fs/ext2fs/inode.h @@ -187,11 +187,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_ */ |