Changes to existing files for ext2fs support. The UFS mods need rework

in the future as they are a bit crufty -- but at least the stuff is in the
tree now.

4 files changed, 14 insertions, 4 deletions

diff --git a/sys/gnu/ext2fs/ext2_mount.h b/sys/gnu/ext2fs/ext2_mount.h
index 02fdff2..e085b8b 100644
--- a/sys/gnu/ext2fs/ext2_mount.h
+++ b/sys/gnu/ext2fs/ext2_mount.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufsmount.h	8.2 (Berkeley) 1/12/94
- * $Id: ufsmount.h,v 1.2 1994/08/02 07:55:04 davidg Exp $
+ * $Id: ufsmount.h,v 1.3 1994/08/21 07:16:18 paul Exp $
  */
 
 #ifndef _UFS_UFS_UFSMOUNT_H_
@@ -54,9 +54,12 @@ struct ufsmount {
 	union {					/* pointer to superblock */
 		struct	lfs *lfs;		/* LFS */
 		struct	fs *fs;			/* FFS */
+		struct	ext2_sb_info *e2fs;	/* EXT2FS */
 	} ufsmount_u;
 #define	um_fs	ufsmount_u.fs
 #define	um_lfs	ufsmount_u.lfs
+#define	um_e2fs	ufsmount_u.e2fs
+#define um_e2fsb ufsmount_u.e2fs->s_es
 	struct	vnode *um_quotas[MAXQUOTAS];	/* pointer to quota files */
 	struct	ucred *um_cred[MAXQUOTAS];	/* quota file access cred */
 	u_long	um_nindir;			/* indirect ptrs per block */
diff --git a/sys/gnu/ext2fs/inode.h b/sys/gnu/ext2fs/inode.h
index 00105ea..7ff725b 100644
--- a/sys/gnu/ext2fs/inode.h
+++ b/sys/gnu/ext2fs/inode.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)inode.h	8.4 (Berkeley) 1/21/94
- * $Id: inode.h,v 1.5 1995/04/24 05:13:11 dyson Exp $
+ * $Id: inode.h,v 1.6 1995/05/30 08:15:30 rgrimes Exp $
  */
 
 #ifndef _UFS_UFS_INODE_H_
@@ -74,9 +74,11 @@ struct inode {
 	union {			/* Associated filesystem. */
 		struct	fs *fs;		/* FFS */
 		struct	lfs *lfs;	/* LFS */
+		struct	ext2_sb_info *e2fs;	/* EXT2FS */
 	} inode_u;
 #define	i_fs	inode_u.fs
 #define	i_lfs	inode_u.lfs
+#define	i_e2fs	inode_u.e2fs
 	struct	dquot *i_dquot[MAXQUOTAS];	/* Dquot structures. */
 	u_quad_t i_modrev;	/* Revision level for lease. */
 	struct	lockf *i_lockf;	/* Head of byte-level lock list. */
diff --git a/sys/gnu/fs/ext2fs/ext2_mount.h b/sys/gnu/fs/ext2fs/ext2_mount.h
index 02fdff2..e085b8b 100644
--- a/sys/gnu/fs/ext2fs/ext2_mount.h
+++ b/sys/gnu/fs/ext2fs/ext2_mount.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufsmount.h	8.2 (Berkeley) 1/12/94
- * $Id: ufsmount.h,v 1.2 1994/08/02 07:55:04 davidg Exp $
+ * $Id: ufsmount.h,v 1.3 1994/08/21 07:16:18 paul Exp $
  */
 
 #ifndef _UFS_UFS_UFSMOUNT_H_
@@ -54,9 +54,12 @@ struct ufsmount {
 	union {					/* pointer to superblock */
 		struct	lfs *lfs;		/* LFS */
 		struct	fs *fs;			/* FFS */
+		struct	ext2_sb_info *e2fs;	/* EXT2FS */
 	} ufsmount_u;
 #define	um_fs	ufsmount_u.fs
 #define	um_lfs	ufsmount_u.lfs
+#define	um_e2fs	ufsmount_u.e2fs
+#define um_e2fsb ufsmount_u.e2fs->s_es
 	struct	vnode *um_quotas[MAXQUOTAS];	/* pointer to quota files */
 	struct	ucred *um_cred[MAXQUOTAS];	/* quota file access cred */
 	u_long	um_nindir;			/* indirect ptrs per block */
diff --git a/sys/gnu/fs/ext2fs/inode.h b/sys/gnu/fs/ext2fs/inode.h
index 00105ea..7ff725b 100644
--- a/sys/gnu/fs/ext2fs/inode.h
+++ b/sys/gnu/fs/ext2fs/inode.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)inode.h	8.4 (Berkeley) 1/21/94
- * $Id: inode.h,v 1.5 1995/04/24 05:13:11 dyson Exp $
+ * $Id: inode.h,v 1.6 1995/05/30 08:15:30 rgrimes Exp $
  */
 
 #ifndef _UFS_UFS_INODE_H_
@@ -74,9 +74,11 @@ struct inode {
 	union {			/* Associated filesystem. */
 		struct	fs *fs;		/* FFS */
 		struct	lfs *lfs;	/* LFS */
+		struct	ext2_sb_info *e2fs;	/* EXT2FS */
 	} inode_u;
 #define	i_fs	inode_u.fs
 #define	i_lfs	inode_u.lfs
+#define	i_e2fs	inode_u.e2fs
 	struct	dquot *i_dquot[MAXQUOTAS];	/* Dquot structures. */
 	u_quad_t i_modrev;	/* Revision level for lease. */
 	struct	lockf *i_lockf;	/* Head of byte-level lock list. */