summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tmpfs/dir.c3
-rw-r--r--tmpfs/tmpfs.h1
2 files changed, 0 insertions, 4 deletions
diff --git a/tmpfs/dir.c b/tmpfs/dir.c
index 2702da54..65386e0a 100644
--- a/tmpfs/dir.c
+++ b/tmpfs/dir.c
@@ -58,9 +58,6 @@ diskfs_get_directs (struct node *dp, int entry, int n,
struct dirent *entp;
int i;
- assert (offsetof (struct tmpfs_dirent, name)
- >= offsetof (struct dirent, d_name));
-
if (bufsiz == 0)
bufsiz = dp->dn_stat.st_size
+ 2 * ((offsetof (struct dirent, d_name[3]) + 7) & ~7);
diff --git a/tmpfs/tmpfs.h b/tmpfs/tmpfs.h
index 3d38e2ab..3cb31e6b 100644
--- a/tmpfs/tmpfs.h
+++ b/tmpfs/tmpfs.h
@@ -65,7 +65,6 @@ struct tmpfs_dirent
{
struct tmpfs_dirent *next;
struct disknode *dn;
- uint32_t pad;
uint8_t namelen;
char name[0];
};