aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/fs/tarfs/tarfs.h2
-rw-r--r--sys/fs/tarfs/tarfs_vnops.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/sys/fs/tarfs/tarfs.h b/sys/fs/tarfs/tarfs.h
index ff1985e488cd..ffb95d2c0ac5 100644
--- a/sys/fs/tarfs/tarfs.h
+++ b/sys/fs/tarfs/tarfs.h
@@ -165,7 +165,7 @@ struct tarfs_fid {
u_short data0; /* force alignment */
ino_t ino;
unsigned long gen;
-};
+} __packed;
#define TARFS_NODE_LOCK(tnp) \
mtx_lock(&(tnp)->lock)
diff --git a/sys/fs/tarfs/tarfs_vnops.c b/sys/fs/tarfs/tarfs_vnops.c
index f2828c60f8a7..4bc923ed8f9c 100644
--- a/sys/fs/tarfs/tarfs_vnops.c
+++ b/sys/fs/tarfs/tarfs_vnops.c
@@ -668,6 +668,8 @@ tarfs_vptofh(struct vop_vptofh_args *ap)
{
struct tarfs_fid *tfp;
struct tarfs_node *tnp;
+ _Static_assert(sizeof(struct tarfs_fid) <= sizeof(struct fid),
+ "struct tarfs_fid cannot be larger than struct fid");
tfp = (struct tarfs_fid *)ap->a_fhp;
tnp = VP_TO_TARFS_NODE(ap->a_vp);