[dgorbachev] 42194: Undo part of r42190. Sorry.

Author: dgorbachev
Date: Sat Jul 25 09:59:18 2009
New Revision: 42194

URL: http://svn.reactos.org/svn/reactos?rev=42194&view=rev
Log:
Undo part of r42190. Sorry.

Modified:
    trunk/reactos/boot/freeldr/freeldr/include/fs/ext2.h

Modified: trunk/reactos/boot/freeldr/freeldr/include/fs/ext2.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/include/fs/ext2.h [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/include/fs/ext2.h [iso-8859-1] Sat Jul 25 09:59:18
2009
@@ -20,154 +20,613 @@
 #ifndef __EXT2_H
 #define __EXT2_H
 
-/*
- *  grub/fs/ext2.c
+
+/*
+ *  linux/include/linux/ext3_fs.h
  *
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2003,2004,2005,2007  Free Software Foundation, Inc.
+ * Copyright (C) 1992, 1993, 1994, 1995
+ * Remy Card (card(a)masi.ibp.fr)
+ * Laboratoire MASI - Institut Blaise Pascal
+ * Universite Pierre et Marie Curie (Paris VI)
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  from
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  linux/include/linux/minix_fs.h
  *
- *  You should have received a copy of the GNU General Public License
- *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* Magic value used to identify an ext2 filesystem.  */
-#define	EXT2_MAGIC		0xEF53
-/* Amount of indirect blocks in an inode.  */
-#define INDIRECT_BLOCKS		12
-/* Maximum lenght of a pathname.  */
-#define EXT2_PATH_MAX		4096
-/* Maximum nesting of symlinks, used to prevent a loop.  */
-#define	EXT2_MAX_SYMLINKCNT	8
-
-/* The good old revision and the default inode size.  */
-#define EXT2_GOOD_OLD_REVISION		0
-#define EXT2_GOOD_OLD_INODE_SIZE	128
-
-/* Filetype used in directory entry.  */
-#define	FILETYPE_UNKNOWN	0
-#define	FILETYPE_REG		1
-#define	FILETYPE_DIRECTORY	2
-#define	FILETYPE_SYMLINK	7
-
-/* Filetype information as used in inodes.  */
-#define FILETYPE_INO_MASK	0170000
-#define FILETYPE_INO_REG	0100000
-#define FILETYPE_INO_DIRECTORY	0040000
-#define FILETYPE_INO_SYMLINK	0120000
-
-/* The ext2 superblock.  */
-struct ext2_sblock
+ *  Copyright (C) 1991, 1992  Linus Torvalds
+ */
+
+#ifndef _LINUX_EXT3_FS_H
+#define _LINUX_EXT3_FS_H
+
+//#include <linux/types.h>
+
+/*
+ * The second extended filesystem constants/structures
+ */
+
+/*
+ * Define EXT3FS_DEBUG to produce debug messages
+ */
+#undef EXT3FS_DEBUG
+
+/*
+ * Define EXT3_PREALLOCATE to preallocate data blocks for expanding files
+ */
+#undef  EXT3_PREALLOCATE /* @@@ Fix this! */
+#define EXT3_DEFAULT_PREALLOC_BLOCKS	8
+
+/*
+ * The second extended file system version
+ */
+#define EXT3FS_DATE		"10 Jan 2002"
+#define EXT3FS_VERSION		"2.4-0.9.17"
+
+/*
+ * Debug code
+ */
+#ifdef EXT3FS_DEBUG
+#define ext3_debug(f, a...)						\
+	do {								\
+		printk (KERN_DEBUG "EXT3-fs DEBUG (%s, %d): %s:",	\
+			__FILE__, __LINE__, __FUNCTION__);		\
+		printk (KERN_DEBUG f, ## a);				\
+	} while (0)
+#else
+	#ifdef __GNUC__
+		#define ext3_debug(f, a...)	do {} while (0)
+	#else
+		#define ext3_debug
+	#endif
+#endif
+
+/*
+ * Special inodes numbers
+ */
+#define	EXT3_BAD_INO		 1	/* Bad blocks inode */
+#define EXT3_ROOT_INO		 2	/* Root inode */
+#define EXT3_ACL_IDX_INO	 3	/* ACL inode */
+#define EXT3_ACL_DATA_INO	 4	/* ACL inode */
+#define EXT3_BOOT_LOADER_INO	 5	/* Boot loader inode */
+#define EXT3_UNDEL_DIR_INO	 6	/* Undelete directory inode */
+#define EXT3_RESIZE_INO		 7	/* Reserved group descriptors inode */
+#define EXT3_JOURNAL_INO	 8	/* Journal inode */
+
+/* First non-reserved inode for old ext3 filesystems */
+#define EXT3_GOOD_OLD_FIRST_INO	11
+
+/*
+ * The second extended file system magic number
+ */
+#define EXT3_SUPER_MAGIC	0xEF53
+
+/*
+ * Maximal count of links to a file
+ */
+#define EXT3_LINK_MAX		32000
+
+/*
+ * Macro-instructions used to manage several block sizes
+ */
+#define EXT3_MIN_BLOCK_SIZE		1024
+#define	EXT3_MAX_BLOCK_SIZE		4096
+#define EXT3_MIN_BLOCK_LOG_SIZE		  10
+#ifdef __KERNEL__
+# define EXT3_BLOCK_SIZE(s)		((s)->s_blocksize)
+#else
+# define EXT3_BLOCK_SIZE(s)		(EXT3_MIN_BLOCK_SIZE << (s)->s_log_block_size)
+#endif
+#define EXT3_ACLE_PER_BLOCK(s)		(EXT3_BLOCK_SIZE(s) / sizeof (struct ext3_acl_entry))
+#define	EXT3_ADDR_PER_BLOCK(s)		(EXT3_BLOCK_SIZE(s) / sizeof (ULONG))
+#ifdef __KERNEL__
+# define EXT3_BLOCK_SIZE_BITS(s)	((s)->s_blocksize_bits)
+#else
+# define EXT3_BLOCK_SIZE_BITS(s)	((s)->s_log_block_size + 10)
+#endif
+#ifdef __KERNEL__
+#define	EXT3_ADDR_PER_BLOCK_BITS(s)	((s)->u.ext3_sb.s_addr_per_block_bits)
+#define EXT3_INODE_SIZE(s)		((s)->u.ext3_sb.s_inode_size)
+#define EXT3_FIRST_INO(s)		((s)->u.ext3_sb.s_first_ino)
+#else
+#define EXT3_INODE_SIZE(s)	(((s)->s_rev_level == EXT3_GOOD_OLD_REV) ? \
+				 EXT3_GOOD_OLD_INODE_SIZE : \
+				 (s)->s_inode_size)
+#define EXT3_FIRST_INO(s)	(((s)->s_rev_level == EXT3_GOOD_OLD_REV) ? \
+				 EXT3_GOOD_OLD_FIRST_INO : \
+				 (s)->s_first_ino)
+#endif
+
+/*
+ * Macro-instructions used to manage fragments
+ */
+#define EXT3_MIN_FRAG_SIZE		1024
+#define	EXT3_MAX_FRAG_SIZE		4096
+#define EXT3_MIN_FRAG_LOG_SIZE		  10
+#ifdef __KERNEL__
+# define EXT3_FRAG_SIZE(s)		((s)->u.ext3_sb.s_frag_size)
+# define EXT3_FRAGS_PER_BLOCK(s)	((s)->u.ext3_sb.s_frags_per_block)
+#else
+# define EXT3_FRAG_SIZE(s)		(EXT3_MIN_FRAG_SIZE << (s)->s_log_frag_size)
+# define EXT3_FRAGS_PER_BLOCK(s)	(EXT3_BLOCK_SIZE(s) / EXT3_FRAG_SIZE(s))
+#endif
+
+/*
+ * ACL structures
+ */
+struct ext3_acl_header	/* Header of Access Control Lists */
 {
-  ULONG total_inodes;
-  ULONG total_blocks;
-  ULONG reserved_blocks;
-  ULONG free_blocks;
-  ULONG free_inodes;
-  ULONG first_data_block;
-  ULONG log2_block_size;
-  ULONG log2_fragment_size;
-  ULONG blocks_per_group;
-  ULONG fragments_per_group;
-  ULONG inodes_per_group;
-  ULONG mtime;
-  ULONG utime;
-  USHORT mnt_count;
-  USHORT max_mnt_count;
-  USHORT magic;
-  USHORT fs_state;
-  USHORT error_handling;
-  USHORT minor_revision_level;
-  ULONG lastcheck;
-  ULONG checkinterval;
-  ULONG creator_os;
-  ULONG revision_level;
-  USHORT uid_reserved;
-  USHORT gid_reserved;
-  ULONG first_inode;
-  USHORT inode_size;
-  USHORT block_group_number;
-  ULONG feature_compatibility;
-  ULONG feature_incompat;
-  ULONG feature_ro_compat;
-  ULONG unique_id[4];
-  char volume_name[16];
-  char last_mounted_on[64];
-  ULONG compression_info;
+	ULONG	aclh_size;
+	ULONG	aclh_file_count;
+	ULONG	aclh_acle_count;
+	ULONG	aclh_first_acle;
 };
 
-/* The ext2 blockgroup.  */
-struct ext2_block_group
+struct ext3_acl_entry	/* Access Control List Entry */
 {
-  ULONG block_id;
-  ULONG inode_id;
-  ULONG inode_table_id;
-  USHORT free_blocks;
-  USHORT free_inodes;
-  USHORT used_dirs;
-  USHORT pad;
-  ULONG reserved[3];
+	ULONG	acle_size;
+	USHORT	acle_perms;	/* Access permissions */
+	USHORT	acle_type;	/* Type of entry */
+	USHORT	acle_tag;	/* User or group identity */
+	USHORT	acle_pad1;
+	ULONG	acle_next;	/* Pointer on next entry for the */
+					/* same inode or on next free entry */
 };
 
-/* The ext2 inode.  */
-struct ext2_inode
+/*
+ * Structure of a blocks group descriptor
+ */
+struct ext3_group_desc
 {
-  USHORT mode;
-  USHORT uid;
-  ULONG size;
-  ULONG atime;
-  ULONG ctime;
-  ULONG mtime;
-  ULONG dtime;
-  USHORT gid;
-  USHORT nlinks;
-  ULONG blockcnt;  /* Blocks of 512 bytes!! */
-  ULONG flags;
-  ULONG osd1;
-  union
-  {
-    struct datablocks
-    {
-      ULONG dir_blocks[INDIRECT_BLOCKS];
-      ULONG indir_block;
-      ULONG double_indir_block;
-      ULONG tripple_indir_block;
-    } blocks;
-    char symlink[60];
-  };
-  ULONG version;
-  ULONG acl;
-  ULONG dir_acl;
-  ULONG fragment_addr;
-  ULONG osd2[3];
+	ULONG	bg_block_bitmap;		/* Blocks bitmap block */
+	ULONG	bg_inode_bitmap;		/* Inodes bitmap block */
+	ULONG	bg_inode_table;		/* Inodes table block */
+	USHORT	bg_free_blocks_count;	/* Free blocks count */
+	USHORT	bg_free_inodes_count;	/* Free inodes count */
+	USHORT	bg_used_dirs_count;	/* Directories count */
+	USHORT	bg_pad;
+	ULONG	bg_reserved[3];
 };
 
-/* The header of an ext2 directory entry.  */
-struct ext2_dirent
+/*
+ * Macro-instructions used to manage group descriptors
+ */
+#ifdef __KERNEL__
+# define EXT3_BLOCKS_PER_GROUP(s)	((s)->u.ext3_sb.s_blocks_per_group)
+# define EXT3_DESC_PER_BLOCK(s)		((s)->u.ext3_sb.s_desc_per_block)
+# define EXT3_INODES_PER_GROUP(s)	((s)->u.ext3_sb.s_inodes_per_group)
+# define EXT3_DESC_PER_BLOCK_BITS(s)	((s)->u.ext3_sb.s_desc_per_block_bits)
+#else
+# define EXT3_BLOCKS_PER_GROUP(s)	((s)->s_blocks_per_group)
+# define EXT3_DESC_PER_BLOCK(s)		(EXT3_BLOCK_SIZE(s) / sizeof (struct ext3_group_desc))
+# define EXT3_INODES_PER_GROUP(s)	((s)->s_inodes_per_group)
+#endif
+
+/*
+ * Constants relative to the data blocks
+ */
+#define	EXT3_NDIR_BLOCKS		12
+#define	EXT3_IND_BLOCK			EXT3_NDIR_BLOCKS
+#define	EXT3_DIND_BLOCK			(EXT3_IND_BLOCK + 1)
+#define	EXT3_TIND_BLOCK			(EXT3_DIND_BLOCK + 1)
+#define	EXT3_N_BLOCKS			(EXT3_TIND_BLOCK + 1)
+
+/*
+ * Inode flags
+ */
+#define	EXT3_SECRM_FL			0x00000001 /* Secure deletion */
+#define	EXT3_UNRM_FL			0x00000002 /* Undelete */
+#define	EXT3_COMPR_FL			0x00000004 /* Compress file */
+#define EXT3_SYNC_FL			0x00000008 /* Synchronous updates */
+#define EXT3_IMMUTABLE_FL		0x00000010 /* Immutable file */
+#define EXT3_APPEND_FL			0x00000020 /* writes to file may only append */
+#define EXT3_NODUMP_FL			0x00000040 /* do not dump file */
+#define EXT3_NOATIME_FL			0x00000080 /* do not update atime */
+/* Reserved for compression usage... */
+#define EXT3_DIRTY_FL			0x00000100
+#define EXT3_COMPRBLK_FL		0x00000200 /* One or more compressed clusters */
+#define EXT3_NOCOMPR_FL			0x00000400 /* Don't compress */
+#define EXT3_ECOMPR_FL			0x00000800 /* Compression error */
+/* End compression flags --- maybe not all used */
+#define EXT3_INDEX_FL			0x00001000 /* hash-indexed directory */
+#define EXT3_IMAGIC_FL			0x00002000 /* AFS directory */
+#define EXT3_JOURNAL_DATA_FL		0x00004000 /* file data should be journaled */
+#define EXT3_RESERVED_FL		0x80000000 /* reserved for ext3 lib */
+
+#define EXT3_FL_USER_VISIBLE		0x00005FFF /* User visible flags */
+#define EXT3_FL_USER_MODIFIABLE		0x000000FF /* User modifiable flags */
+
+/*
+ * Inode dynamic state flags
+ */
+#define EXT3_STATE_JDATA		0x00000001 /* journaled data exists */
+#define EXT3_STATE_NEW			0x00000002 /* inode is newly created */
+
+/*
+ * ioctl commands
+ */
+#define	EXT3_IOC_GETFLAGS		_IOR('f', 1, long)
+#define	EXT3_IOC_SETFLAGS		_IOW('f', 2, long)
+#define	EXT3_IOC_GETVERSION		_IOR('f', 3, long)
+#define	EXT3_IOC_SETVERSION		_IOW('f', 4, long)
+#define	EXT3_IOC_GETVERSION_OLD		_IOR('v', 1, long)
+#define	EXT3_IOC_SETVERSION_OLD		_IOW('v', 2, long)
+#ifdef CONFIG_JBD_DEBUG
+#define EXT3_IOC_WAIT_FOR_READONLY	_IOR('f', 99, long)
+#endif
+
+/*
+ * Structure of an inode on the disk
+ */
+struct ext3_inode {
+	USHORT	i_mode;		/* File mode */
+	USHORT	i_uid;		/* Low 16 bits of Owner Uid */
+	ULONG	i_size;		/* Size in bytes */
+	ULONG	i_atime;	/* Access time */
+	ULONG	i_ctime;	/* Creation time */
+	ULONG	i_mtime;	/* Modification time */
+	ULONG	i_dtime;	/* Deletion Time */
+	USHORT	i_gid;		/* Low 16 bits of Group Id */
+	USHORT	i_links_count;	/* Links count */
+	ULONG	i_blocks;	/* Blocks count */
+	ULONG	i_flags;	/* File flags */
+	union {
+		struct {
+			ULONG  l_i_reserved1;
+		} linux1;
+		struct {
+			ULONG  h_i_translator;
+		} hurd1;
+		struct {
+			ULONG  m_i_reserved1;
+		} masix1;
+	} osd1;				/* OS dependent 1 */
+	ULONG	i_block[EXT3_N_BLOCKS];/* Pointers to blocks */
+	ULONG	i_generation;	/* File version (for NFS) */
+	ULONG	i_file_acl;	/* File ACL */
+	ULONG	i_dir_acl;	/* Directory ACL */
+	ULONG	i_faddr;	/* Fragment address */
+	union {
+		struct {
+			UCHAR	l_i_frag;	/* Fragment number */
+			UCHAR	l_i_fsize;	/* Fragment size */
+			USHORT	i_pad1;
+			USHORT	l_i_uid_high;	/* these 2 fields    */
+			USHORT	l_i_gid_high;	/* were reserved2[0] */
+			ULONG	l_i_reserved2;
+		} linux2;
+		struct {
+			UCHAR	h_i_frag;	/* Fragment number */
+			UCHAR	h_i_fsize;	/* Fragment size */
+			USHORT	h_i_mode_high;
+			USHORT	h_i_uid_high;
+			USHORT	h_i_gid_high;
+			ULONG	h_i_author;
+		} hurd2;
+		struct {
+			UCHAR	m_i_frag;	/* Fragment number */
+			UCHAR	m_i_fsize;	/* Fragment size */
+			USHORT	m_pad1;
+			ULONG	m_i_reserved2[2];
+		} masix2;
+	} osd2;				/* OS dependent 2 */
+};
+
+#define i_size_high	i_dir_acl
+
+#if defined(__KERNEL__) || defined(__linux__)
+#define i_reserved1	osd1.linux1.l_i_reserved1
+#define i_frag		osd2.linux2.l_i_frag
+#define i_fsize		osd2.linux2.l_i_fsize
+#define i_uid_low	i_uid
+#define i_gid_low	i_gid
+#define i_uid_high	osd2.linux2.l_i_uid_high
+#define i_gid_high	osd2.linux2.l_i_gid_high
+#define i_reserved2	osd2.linux2.l_i_reserved2
+
+#elif defined(__GNU__)
+
+#define i_translator	osd1.hurd1.h_i_translator
+#define i_frag		osd2.hurd2.h_i_frag;
+#define i_fsize		osd2.hurd2.h_i_fsize;
+#define i_uid_high	osd2.hurd2.h_i_uid_high
+#define i_gid_high	osd2.hurd2.h_i_gid_high
+#define i_author	osd2.hurd2.h_i_author
+
+#elif defined(__masix__)
+
+#define i_reserved1	osd1.masix1.m_i_reserved1
+#define i_frag		osd2.masix2.m_i_frag
+#define i_fsize		osd2.masix2.m_i_fsize
+#define i_reserved2	osd2.masix2.m_i_reserved2
+
+#endif /* defined(__KERNEL__) || defined(__linux__) */
+
+/*
+ * File system states
+ */
+#define	EXT3_VALID_FS			0x0001	/* Unmounted cleanly */
+#define	EXT3_ERROR_FS			0x0002	/* Errors detected */
+#define	EXT3_ORPHAN_FS			0x0004	/* Orphans being recovered */
+
+/*
+ * Mount flags
+ */
+#define EXT3_MOUNT_CHECK		0x0001	/* Do mount-time checks */
+#define EXT3_MOUNT_GRPID		0x0004	/* Create files with directory's group */
+#define EXT3_MOUNT_DEBUG		0x0008	/* Some debugging messages */
+#define EXT3_MOUNT_ERRORS_CONT		0x0010	/* Continue on errors */
+#define EXT3_MOUNT_ERRORS_RO		0x0020	/* Remount fs ro on errors */
+#define EXT3_MOUNT_ERRORS_PANIC		0x0040	/* Panic on errors */
+#define EXT3_MOUNT_MINIX_DF		0x0080	/* Mimics the Minix statfs */
+#define EXT3_MOUNT_NOLOAD		0x0100	/* Don't use existing journal*/
+#define EXT3_MOUNT_ABORT		0x0200	/* Fatal error detected */
+#define EXT3_MOUNT_DATA_FLAGS		0x0C00	/* Mode for data writes: */
+  #define EXT3_MOUNT_JOURNAL_DATA	0x0400	/* Write data to journal */
+  #define EXT3_MOUNT_ORDERED_DATA	0x0800	/* Flush data before commit */
+  #define EXT3_MOUNT_WRITEBACK_DATA	0x0C00	/* No data ordering */
+#define EXT3_MOUNT_UPDATE_JOURNAL	0x1000	/* Update the journal format */
+#define EXT3_MOUNT_NO_UID32		0x2000  /* Disable 32-bit UIDs */
+
+/* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */
+#ifndef _LINUX_EXT2_FS_H
+#define clear_opt(o, opt)		o &= ~EXT3_MOUNT_##opt
+#define set_opt(o, opt)			o |= EXT3_MOUNT_##opt
+#define test_opt(sb, opt)		((sb)->u.ext3_sb.s_mount_opt & \
+					 EXT3_MOUNT_##opt)
+#else
+#define EXT2_MOUNT_NOLOAD		EXT3_MOUNT_NOLOAD
+#define EXT2_MOUNT_ABORT		EXT3_MOUNT_ABORT
+#endif
+
+#define ext3_set_bit			ext2_set_bit
+#define ext3_clear_bit			ext2_clear_bit
+#define ext3_test_bit			ext2_test_bit
+#define ext3_find_first_zero_bit	ext2_find_first_zero_bit
+#define ext3_find_next_zero_bit		ext2_find_next_zero_bit
+
+/*
+ * Maximal mount counts between two filesystem checks
+ */
+#define EXT3_DFL_MAX_MNT_COUNT		20	/* Allow 20 mounts */
+#define EXT3_DFL_CHECKINTERVAL		0	/* Don't use interval check */
+
+/*
+ * Behaviour when detecting errors
+ */
+#define EXT3_ERRORS_CONTINUE		1	/* Continue execution */
+#define EXT3_ERRORS_RO			2	/* Remount fs read-only */
+#define EXT3_ERRORS_PANIC		3	/* Panic */
+#define EXT3_ERRORS_DEFAULT		EXT3_ERRORS_CONTINUE
+
+/*
+ * Structure of the super block
+ */
+struct ext3_super_block {
+/*00*/	ULONG	s_inodes_count;		/* Inodes count */
+	ULONG	s_blocks_count;		/* Blocks count */
+	ULONG	s_r_blocks_count;	/* Reserved blocks count */
+	ULONG	s_free_blocks_count;	/* Free blocks count */
+/*10*/	ULONG	s_free_inodes_count;	/* Free inodes count */
+	ULONG	s_first_data_block;	/* First Data Block */
+	ULONG	s_log_block_size;	/* Block size */
+	LONG	s_log_frag_size;	/* Fragment size */
+/*20*/	ULONG	s_blocks_per_group;	/* # Blocks per group */
+	ULONG	s_frags_per_group;	/* # Fragments per group */
+	ULONG	s_inodes_per_group;	/* # Inodes per group */
+	ULONG	s_mtime;		/* Mount time */
+/*30*/	ULONG	s_wtime;		/* Write time */
+	USHORT	s_mnt_count;		/* Mount count */
+	SHORT	s_max_mnt_count;	/* Maximal mount count */
+	USHORT	s_magic;		/* Magic signature */
+	USHORT	s_state;		/* File system state */
+	USHORT	s_errors;		/* Behaviour when detecting errors */
+	USHORT	s_minor_rev_level;	/* minor revision level */
+/*40*/	ULONG	s_lastcheck;		/* time of last check */
+	ULONG	s_checkinterval;	/* max. time between checks */
+	ULONG	s_creator_os;		/* OS */
+	ULONG	s_rev_level;		/* Revision level */
+/*50*/	USHORT	s_def_resuid;		/* Default uid for reserved blocks */
+	USHORT	s_def_resgid;		/* Default gid for reserved blocks */
+	/*
+	 * These fields are for EXT3_DYNAMIC_REV superblocks only.
+	 *
+	 * Note: the difference between the compatible feature set and
+	 * the incompatible feature set is that if there is a bit set
+	 * in the incompatible feature set that the kernel doesn't
+	 * know about, it should refuse to mount the filesystem.
+	 *
+	 * e2fsck's requirements are more strict; if it doesn't know
+	 * about a feature in either the compatible or incompatible
+	 * feature set, it must abort and not try to meddle with
+	 * things it doesn't understand...
+	 */
+	ULONG	s_first_ino;		/* First non-reserved inode */
+	USHORT   s_inode_size;		/* size of inode structure */
+	USHORT	s_block_group_nr;	/* block group # of this superblock */
+	ULONG	s_feature_compat;	/* compatible feature set */
+/*60*/	ULONG	s_feature_incompat;	/* incompatible feature set */
+	ULONG	s_feature_ro_compat;	/* readonly-compatible feature set */
+/*68*/	UCHAR	s_uuid[16];		/* 128-bit uuid for volume */
+/*78*/	char	s_volume_name[16];	/* volume name */
+/*88*/	char	s_last_mounted[64];	/* directory where last mounted */
+/*C8*/	ULONG	s_algorithm_usage_bitmap; /* For compression */
+	/*
+	 * Performance hints.  Directory preallocation should only
+	 * happen if the EXT3_FEATURE_COMPAT_DIR_PREALLOC flag is on.
+	 */
+	UCHAR	s_prealloc_blocks;	/* Nr of blocks to try to preallocate*/
+	UCHAR	s_prealloc_dir_blocks;	/* Nr to preallocate for dirs */
+	USHORT	s_padding1;
+	/*
+	 * Journaling support valid if EXT3_FEATURE_COMPAT_HAS_JOURNAL set.
+	 */
+/*D0*/	UCHAR	s_journal_uuid[16];	/* uuid of journal superblock */
+/*E0*/	ULONG	s_journal_inum;		/* inode number of journal file */
+	ULONG	s_journal_dev;		/* device number of journal file */
+	ULONG	s_last_orphan;		/* start of list of inodes to delete */
+
+/*EC*/	ULONG	s_reserved[197];	/* Padding to the end of the block */
+};
+
+#ifdef __KERNEL__
+#define EXT3_SB(sb)	(&((sb)->u.ext3_sb))
+#define EXT3_I(inode)	(&((inode)->u.ext3_i))
+#else
+/* Assume that user mode programs are passing in an ext3fs superblock, not
+ * a kernel struct super_block.  This will allow us to call the feature-test
+ * macros from user land. */
+#define EXT3_SB(sb)	(sb)
+#endif
+
+#define NEXT_ORPHAN(inode) (inode)->u.ext3_i.i_dtime
+
+/*
+ * Codes for operating systems
+ */
+#define EXT3_OS_LINUX		0
+#define EXT3_OS_HURD		1
+#define EXT3_OS_MASIX		2
+#define EXT3_OS_FREEBSD		3
+#define EXT3_OS_LITES		4
+
+/*
+ * Revision levels
+ */
+#define EXT3_GOOD_OLD_REV	0	/* The good old (original) format */
+#define EXT3_DYNAMIC_REV	1	/* V2 format w/ dynamic inode sizes */
+
+#define EXT3_CURRENT_REV	EXT3_GOOD_OLD_REV
+#define EXT3_MAX_SUPP_REV	EXT3_DYNAMIC_REV
+
+#define EXT3_GOOD_OLD_INODE_SIZE 128
+
+/*
+ * Feature set definitions
+ */
+
+#define EXT3_HAS_COMPAT_FEATURE(sb,mask)			\
+	( EXT3_SB(sb)->s_es->s_feature_compat & cpu_to_le32(mask) )
+#define EXT3_HAS_RO_COMPAT_FEATURE(sb,mask)			\
+	( EXT3_SB(sb)->s_es->s_feature_ro_compat & cpu_to_le32(mask) )
+#define EXT3_HAS_INCOMPAT_FEATURE(sb,mask)			\
+	( EXT3_SB(sb)->s_es->s_feature_incompat & cpu_to_le32(mask) )
+#define EXT3_SET_COMPAT_FEATURE(sb,mask)			\
+	EXT3_SB(sb)->s_es->s_feature_compat |= cpu_to_le32(mask)
+#define EXT3_SET_RO_COMPAT_FEATURE(sb,mask)			\
+	EXT3_SB(sb)->s_es->s_feature_ro_compat |= cpu_to_le32(mask)
+#define EXT3_SET_INCOMPAT_FEATURE(sb,mask)			\
+	EXT3_SB(sb)->s_es->s_feature_incompat |= cpu_to_le32(mask)
+#define EXT3_CLEAR_COMPAT_FEATURE(sb,mask)			\
+	EXT3_SB(sb)->s_es->s_feature_compat &= ~cpu_to_le32(mask)
+#define EXT3_CLEAR_RO_COMPAT_FEATURE(sb,mask)			\
+	EXT3_SB(sb)->s_es->s_feature_ro_compat &= ~cpu_to_le32(mask)
+#define EXT3_CLEAR_INCOMPAT_FEATURE(sb,mask)			\
+	EXT3_SB(sb)->s_es->s_feature_incompat &= ~cpu_to_le32(mask)
+
+#define EXT3_FEATURE_COMPAT_DIR_PREALLOC	0x0001
+#define EXT3_FEATURE_COMPAT_IMAGIC_INODES	0x0002
+#define EXT3_FEATURE_COMPAT_HAS_JOURNAL		0x0004
+#define EXT3_FEATURE_COMPAT_EXT_ATTR		0x0008
+#define EXT3_FEATURE_COMPAT_RESIZE_INODE	0x0010
+#define EXT3_FEATURE_COMPAT_DIR_INDEX		0x0020
+
+#define EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER	0x0001
+#define EXT3_FEATURE_RO_COMPAT_LARGE_FILE	0x0002
+#define EXT3_FEATURE_RO_COMPAT_BTREE_DIR	0x0004
+
+#define EXT3_FEATURE_INCOMPAT_COMPRESSION	0x0001
+#define EXT3_FEATURE_INCOMPAT_FILETYPE		0x0002
+#define EXT3_FEATURE_INCOMPAT_RECOVER		0x0004 /* Needs recovery */
+#define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV	0x0008 /* Journal device */
+
+#define EXT3_FEATURE_COMPAT_SUPP	0
+/*#define EXT3_FEATURE_INCOMPAT_SUPP	(EXT3_FEATURE_INCOMPAT_FILETYPE| \
+					 EXT3_FEATURE_INCOMPAT_RECOVER)*/
+#define EXT3_FEATURE_INCOMPAT_SUPP	(EXT3_FEATURE_INCOMPAT_FILETYPE)
+#define EXT3_FEATURE_RO_COMPAT_SUPP	(EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER| \
+					 EXT3_FEATURE_RO_COMPAT_LARGE_FILE| \
+					 EXT3_FEATURE_RO_COMPAT_BTREE_DIR)
+
+/*
+ * Default values for user and/or group using reserved blocks
+ */
+#define	EXT3_DEF_RESUID		0
+#define	EXT3_DEF_RESGID		0
+
+/*
+ * Structure of a directory entry
+ */
+#define EXT3_NAME_LEN 255
+
+struct ext3_dir_entry {
+	ULONG	inode;			/* Inode number */
+	USHORT	rec_len;		/* Directory entry length */
+	USHORT	name_len;		/* Name length */
+	CHAR	name[EXT3_NAME_LEN];	/* File name */
+};
+
+/*
+ * The new version of the directory entry.  Since EXT3 structures are
+ * stored in intel byte order, and the name_len field could never be
+ * bigger than 255 chars, it's safe to reclaim the extra byte for the
+ * file_type field.
+ */
+struct ext3_dir_entry_2 {
+	ULONG	inode;			/* Inode number */
+	USHORT	rec_len;		/* Directory entry length */
+	UCHAR	name_len;		/* Name length */
+	UCHAR	file_type;
+	CHAR	name[EXT3_NAME_LEN];	/* File name */
+};
+
+/*
+ * Ext3 directory file types.  Only the low 3 bits are used.  The
+ * other bits are reserved for now.
+ */
+#define EXT3_FT_UNKNOWN		0
+#define EXT3_FT_REG_FILE	1
+#define EXT3_FT_DIR		2
+#define EXT3_FT_CHRDEV		3
+#define EXT3_FT_BLKDEV		4
+#define EXT3_FT_FIFO		5
+#define EXT3_FT_SOCK		6
+#define EXT3_FT_SYMLINK		7
+
+#define EXT3_FT_MAX		8
+
+/*
+ * EXT3_DIR_PAD defines the directory entries boundaries
+ *
+ * NOTE: It must be a multiple of 4
+ */
+#define EXT3_DIR_PAD			4
+#define EXT3_DIR_ROUND			(EXT3_DIR_PAD - 1)
+#define EXT3_DIR_REC_LEN(name_len)	(((name_len) + 8 + EXT3_DIR_ROUND) & \
+					 ~EXT3_DIR_ROUND)
+
+#ifdef __KERNEL__
+/*
+ * Describe an inode's exact location on disk and in memory
+ */
+struct ext3_iloc
 {
-  ULONG inode;
-  USHORT direntlen;
-  UCHAR namelen;
-  UCHAR filetype;
+	struct buffer_head *bh;
+	struct ext3_inode *raw_inode;
+	unsigned long block_group;
 };
 
-/*
- * End of code from grub/fs/ext2.c
- */
-
-typedef struct ext2_sblock		EXT2_SUPER_BLOCK, *PEXT2_SUPER_BLOCK;
-typedef struct ext2_inode		EXT2_INODE, *PEXT2_INODE;
-typedef struct ext2_block_group		EXT2_GROUP_DESC, *PEXT2_GROUP_DESC;
-typedef struct ext2_dirent		EXT2_DIR_ENTRY, *PEXT2_DIR_ENTRY;
+
+
+#endif	/* __KERNEL__ */
+
+#endif	/* _LINUX_EXT3_FS_H */
+
+
+
+typedef struct ext3_super_block	EXT2_SUPER_BLOCK, *PEXT2_SUPER_BLOCK;
+typedef struct ext3_inode		EXT2_INODE, *PEXT2_INODE;
+typedef struct ext3_group_desc	EXT2_GROUP_DESC, *PEXT2_GROUP_DESC;
+typedef struct ext3_dir_entry_2	EXT2_DIR_ENTRY, *PEXT2_DIR_ENTRY;
 
 // EXT2_INODE::i_mode values
 #define EXT2_S_IRWXO	0x0007	// Other mask
@@ -202,21 +661,23 @@
 
 typedef struct
 {
-	ULONGLONG	FileSize;		// File size
-	ULONGLONG	FilePointer;		// File pointer
+	ULONGLONG			FileSize;			// File size
+	ULONGLONG			FilePointer;		// File pointer
 	ULONG*		FileBlockList;		// File block list
-	UCHAR		DriveNumber;		// Drive number of open file
-	EXT2_INODE	Inode;			// File's inode
+	UCHAR			DriveNumber;		// Drive number of open file
+	EXT2_INODE	Inode;				// File's inode
 } EXT2_FILE_INFO, * PEXT2_FILE_INFO;
+
+
 
 BOOLEAN	Ext2OpenVolume(UCHAR DriveNumber, ULONGLONG VolumeStartSector, ULONGLONG
PartitionSectorCount);
 FILE*	Ext2OpenFile(PCSTR FileName);
 BOOLEAN	Ext2LookupFile(PCSTR FileName, PEXT2_FILE_INFO Ext2FileInfoPointer);
 BOOLEAN	Ext2SearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG DirectorySize,
PCHAR FileName, PEXT2_DIR_ENTRY DirectoryEntry);
 BOOLEAN	Ext2ReadFile(FILE *FileHandle, ULONG BytesToRead, ULONG* BytesRead, PVOID
Buffer);
-ULONG	Ext2GetFileSize(FILE *FileHandle);
+ULONG		Ext2GetFileSize(FILE *FileHandle);
 VOID	Ext2SetFilePointer(FILE *FileHandle, ULONG NewFilePointer);
-ULONG	Ext2GetFilePointer(FILE *FileHandle);
+ULONG		Ext2GetFilePointer(FILE *FileHandle);
 BOOLEAN	Ext2ReadVolumeSectors(UCHAR DriveNumber, ULONGLONG SectorNumber, ULONGLONG
SectorCount, PVOID Buffer);
 
 BOOLEAN	Ext2ReadFileBig(FILE *FileHandle, ULONGLONG BytesToRead, ULONGLONG* BytesRead,
PVOID Buffer);
@@ -225,15 +686,15 @@
 BOOLEAN	Ext2ReadDirectory(ULONG Inode, PVOID* DirectoryBuffer, PEXT2_INODE
InodePointer);
 BOOLEAN	Ext2ReadBlock(ULONG BlockNumber, PVOID Buffer);
 BOOLEAN	Ext2ReadPartialBlock(ULONG BlockNumber, ULONG StartingOffset, ULONG Length, PVOID
Buffer);
-ULONG	Ext2GetGroupDescBlockNumber(ULONG Group);
-ULONG	Ext2GetGroupDescOffsetInBlock(ULONG Group);
-ULONG	Ext2GetInodeGroupNumber(ULONG Inode);
-ULONG	Ext2GetInodeBlockNumber(ULONG Inode);
-ULONG	Ext2GetInodeOffsetInBlock(ULONG Inode);
+ULONG		Ext2GetGroupDescBlockNumber(ULONG Group);
+ULONG		Ext2GetGroupDescOffsetInBlock(ULONG Group);
+ULONG		Ext2GetInodeGroupNumber(ULONG Inode);
+ULONG		Ext2GetInodeBlockNumber(ULONG Inode);
+ULONG		Ext2GetInodeOffsetInBlock(ULONG Inode);
 BOOLEAN	Ext2ReadInode(ULONG Inode, PEXT2_INODE InodeBuffer);
 BOOLEAN	Ext2ReadGroupDescriptor(ULONG Group, PEXT2_GROUP_DESC GroupBuffer);
 ULONG*	Ext2ReadBlockPointerList(PEXT2_INODE Inode);
-ULONGLONG Ext2GetInodeFileSize(PEXT2_INODE Inode);
+ULONGLONG		Ext2GetInodeFileSize(PEXT2_INODE Inode);
 BOOLEAN	Ext2CopyIndirectBlockPointers(ULONG* BlockList, ULONG* CurrentBlockInList, ULONG
BlockCount, ULONG IndirectBlock);
 BOOLEAN	Ext2CopyDoubleIndirectBlockPointers(ULONG* BlockList, ULONG* CurrentBlockInList,
ULONG BlockCount, ULONG DoubleIndirectBlock);
 BOOLEAN	Ext2CopyTripleIndirectBlockPointers(ULONG* BlockList, ULONG* CurrentBlockInList,
ULONG BlockCount, ULONG TripleIndirectBlock);