Fixed bloatage of `struct inode'. We used 5 "spare" fields for ext2fs,

but when i_effnlink was added to support soft updates, there was only
room for 4 spares.  The number of spares was not reduced, so the inode
size became 260 (on i386's), or 512 after rounding up by malloc().
Use one spare field in `struct dinode' instead of the 5th spare field
in the inode and reduced to 4 spares in the inode so that the size is
256 again.

Changed the types of the spares in the inode from int to u_int32_t
so that the inode size has more chance of being <= 256 under other
arches, and downdated ext2fs to match (it was broken to use ints
before rev.1.1).

1 files changed, 2 insertions, 2 deletions

diff --git a/sys/gnu/fs/ext2fs/ext2_extern.h b/sys/gnu/fs/ext2fs/ext2_extern.h
index eb18348..0afd890 100644
--- a/sys/gnu/fs/ext2fs/ext2_extern.h
+++ b/sys/gnu/fs/ext2fs/ext2_extern.h
@@ -81,8 +81,8 @@ struct  ext2_group_desc * get_group_desc __P((struct mount * ,
 void	ext2_discard_prealloc __P((struct inode *));
 int	ext2_inactive __P((struct vop_inactive_args *));
 int	ext2_new_block __P ((struct mount * mp, unsigned long goal,
-			    int * prealloc_count,
-			    int * prealloc_block));
+			    u_int32_t * prealloc_count,
+			    u_int32_t * prealloc_block));
 ino_t	ext2_new_inode __P ((const struct inode * dir, int mode));
 unsigned long ext2_count_free __P((struct buf *map, unsigned int numchars));
 void	ext2_free_blocks __P((struct mount * mp, unsigned long block,