Revert "Fix tmpfs assertion"

As discussed up to http://lists.gnu.org/archive/html/bug-hurd/2010-06/msg00021.html this reverts commit 97c5690 and removes the corresponding assertion. This is related to commit 2f7f90c which changes how much st_size is increased. * tmpfs/tmpfs.h (tmpfs_dirent): Remove `padding' field. * tmpfs/dir.c (diskfs_get_directs): Remove assertion on the position of the `name' field of struct tmpfs_dirent compared to the position of the `d_name' field of struct dirent.
jeremie-koenig · Aug 27, 2010 · 0c0a241 · 0c0a241
1 parent 8c19399
commit 0c0a241
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 4 deletions.
diff --git 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
@@ -65,7 +65,6 @@ struct tmpfs_dirent
 {
   struct tmpfs_dirent *next;
   struct disknode *dn;
-  uint32_t pad;
   uint8_t namelen;
   char name[0];
 };