Use explicitly-sized types where necessary to make ext2fs work again

after the change to a 64-bit daddr_t.

1 files changed, 5 insertions, 5 deletions

diff --git a/sys/gnu/fs/ext2fs/inode.h b/sys/gnu/fs/ext2fs/inode.h
index c387532cb5b0..47046198e8bd 100644
--- a/sys/gnu/fs/ext2fs/inode.h
+++ b/sys/gnu/fs/ext2fs/inode.h
@@ -101,8 +101,8 @@ struct inode {
 	int32_t		i_mtimensec;	/* Last modified time. */
 	int32_t		i_ctime;	/* Last inode change time. */
 	int32_t		i_ctimensec;	/* Last inode change time. */
-	daddr_t		i_db[NDADDR];	/* Direct disk blocks. */
-	daddr_t		i_ib[NIADDR];	/* Indirect disk blocks. */
+	int32_t		i_db[NDADDR];	/* Direct disk blocks. */
+	int32_t		i_ib[NIADDR];	/* Indirect disk blocks. */
 	u_int32_t	i_flags;	/* Status flags (chflags). */
 	int32_t		i_blocks;	/* Blocks actually held. */
 	int32_t		i_gen;		/* Generation number. */
@@ -119,7 +119,7 @@ struct inode {
  */
 #define	i_shortlink	i_db
 #define	i_rdev		i_db[0]
-#define	MAXSYMLINKLEN	((NDADDR + NIADDR) * sizeof(daddr_t))
+#define	MAXSYMLINKLEN	((NDADDR + NIADDR) * sizeof(int32_t))
 
 /* File permissions. */
 #define	IEXEC		0000100		/* Executable. */
@@ -153,10 +153,10 @@ struct inode {
 #ifdef _KERNEL
 /*
  * Structure used to pass around logical block paths generated by
- * ufs_getlbns and used by truncate and bmap code.
+ * ext2_getlbns and used by truncate and bmap code.
  */
 struct indir {
-	daddr_t in_lbn;			/* Logical block number. */
+	int32_t in_lbn;			/* Logical block number. */
 	int	in_off;			/* Offset in buffer. */
 	int	in_exists;		/* Flag if the block exists. */
 };