diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2010-08-27 01:59:04 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2010-08-27 02:02:01 +0200 |
| commit | 0c0a24171e5c2ddfa2268807f5fedc6d8ce6568e (patch) | |
| tree | 347cf8bab264b6b5ab040ad93ac34d6e090e1ac9 /tmpfs | |
| parent | 8c193999f747619d650219493dcdba72a65b3f44 (diff) | |
Revert "Fix tmpfs assertion"
As discussed up to
http://lists.gnu.org/archive/html/bug-hurd/2010-06/msg00021.html
this reverts commit 97c5690abeaa88767acf2ffbb55552e8278052c8 and removes the
corresponding assertion. This is related to commit
2f7f90ce15cce79ef83a8d273e3a27b5b527c7d7
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.
Diffstat (limited to 'tmpfs')
| -rw-r--r-- | tmpfs/dir.c | 3 | ||||
| -rw-r--r-- | tmpfs/tmpfs.h | 1 |
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]; }; |