b837a6
From a1006762fa6f98750bb77d76dd992cb8ea9f9c99 Mon Sep 17 00:00:00 2001
b837a6
From: "H. Peter Anvin" <hpa@zytor.com>
b837a6
Date: Mon, 26 Mar 2012 22:51:09 -0700
b837a6
Subject: [PATCH] libinstaller: Avoid using <linux/ext2_fs.h>
b837a6
b837a6
Don't use <linux/ext2_fs.h> if we can avoid it.
b837a6
b837a6
The ioctl constants have been globalized and moved to <linux/fs.h>.
b837a6
Use a private copy of ext2_fs.h from e2fsprogs with the ioctl
b837a6
constants removed for the data structures.
b837a6
b837a6
Do at least attempt backward compatibility for old kernel headers, but
b837a6
no real hope of proper operation there...
b837a6
b837a6
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
b837a6
---
b837a6
 libinstaller/ext2fs/ext2_fs.h | 856 ++++++++++++++++++++++++++++++++++++++++++
b837a6
 libinstaller/linuxioctl.h     |  29 +-
b837a6
 libinstaller/syslxcom.c       |  12 +-
b837a6
 3 files changed, 886 insertions(+), 11 deletions(-)
b837a6
 create mode 100644 libinstaller/ext2fs/ext2_fs.h
b837a6
b837a6
diff -urpN syslinux-4.05/libinstaller/ext2fs/ext2_fs.h.ext2 syslinux-4.05/libinstaller/ext2fs/ext2_fs.h
b837a6
--- syslinux-4.05/libinstaller/ext2fs/ext2_fs.h.ext2	2012-08-06 09:48:43.797645032 -0400
b837a6
+++ syslinux-4.05/libinstaller/ext2fs/ext2_fs.h	2012-08-06 09:48:43.797645032 -0400
b837a6
@@ -0,0 +1,856 @@
b837a6
+/*
b837a6
+ *  linux/include/linux/ext2_fs.h
b837a6
+ *
b837a6
+ * Copyright (C) 1992, 1993, 1994, 1995
b837a6
+ * Remy Card (card@masi.ibp.fr)
b837a6
+ * Laboratoire MASI - Institut Blaise Pascal
b837a6
+ * Universite Pierre et Marie Curie (Paris VI)
b837a6
+ *
b837a6
+ *  from
b837a6
+ *
b837a6
+ *  linux/include/linux/minix_fs.h
b837a6
+ *
b837a6
+ *  Copyright (C) 1991, 1992  Linus Torvalds
b837a6
+ */
b837a6
+
b837a6
+#ifndef _EXT2FS_EXT2_FS_H
b837a6
+#define _EXT2FS_EXT2_FS_H
b837a6
+
b837a6
+#include <linux/types.h>
b837a6
+
b837a6
+/*
b837a6
+ * The second extended filesystem constants/structures
b837a6
+ */
b837a6
+
b837a6
+/*
b837a6
+ * Define EXT2FS_DEBUG to produce debug messages
b837a6
+ */
b837a6
+#undef EXT2FS_DEBUG
b837a6
+
b837a6
+/*
b837a6
+ * Define EXT2_PREALLOCATE to preallocate data blocks for expanding files
b837a6
+ */
b837a6
+#define EXT2_PREALLOCATE
b837a6
+#define EXT2_DEFAULT_PREALLOC_BLOCKS	8
b837a6
+
b837a6
+/*
b837a6
+ * The second extended file system version
b837a6
+ */
b837a6
+#define EXT2FS_DATE		"95/08/09"
b837a6
+#define EXT2FS_VERSION		"0.5b"
b837a6
+
b837a6
+/*
b837a6
+ * Special inode numbers
b837a6
+ */
b837a6
+#define EXT2_BAD_INO		 1	/* Bad blocks inode */
b837a6
+#define EXT2_ROOT_INO		 2	/* Root inode */
b837a6
+#define EXT4_USR_QUOTA_INO	 3	/* User quota inode */
b837a6
+#define EXT4_GRP_QUOTA_INO	 4	/* Group quota inode */
b837a6
+#define EXT2_BOOT_LOADER_INO	 5	/* Boot loader inode */
b837a6
+#define EXT2_UNDEL_DIR_INO	 6	/* Undelete directory inode */
b837a6
+#define EXT2_RESIZE_INO		 7	/* Reserved group descriptors inode */
b837a6
+#define EXT2_JOURNAL_INO	 8	/* Journal inode */
b837a6
+#define EXT2_EXCLUDE_INO	 9	/* The "exclude" inode, for snapshots */
b837a6
+#define EXT4_REPLICA_INO	10	/* Used by non-upstream feature */
b837a6
+
b837a6
+/* First non-reserved inode for old ext2 filesystems */
b837a6
+#define EXT2_GOOD_OLD_FIRST_INO	11
b837a6
+
b837a6
+/*
b837a6
+ * The second extended file system magic number
b837a6
+ */
b837a6
+#define EXT2_SUPER_MAGIC	0xEF53
b837a6
+
b837a6
+#ifdef __KERNEL__
b837a6
+#define EXT2_SB(sb)	(&((sb)->u.ext2_sb))
b837a6
+#else
b837a6
+/* Assume that user mode programs are passing in an ext2fs superblock, not
b837a6
+ * a kernel struct super_block.  This will allow us to call the feature-test
b837a6
+ * macros from user land. */
b837a6
+#define EXT2_SB(sb)	(sb)
b837a6
+#endif
b837a6
+
b837a6
+/*
b837a6
+ * Maximal count of links to a file
b837a6
+ */
b837a6
+#define EXT2_LINK_MAX		65000
b837a6
+
b837a6
+/*
b837a6
+ * Macro-instructions used to manage several block sizes
b837a6
+ */
b837a6
+#define EXT2_MIN_BLOCK_LOG_SIZE		10	/* 1024 */
b837a6
+#define EXT2_MAX_BLOCK_LOG_SIZE		16	/* 65536 */
b837a6
+#define EXT2_MIN_BLOCK_SIZE	(1 << EXT2_MIN_BLOCK_LOG_SIZE)
b837a6
+#define EXT2_MAX_BLOCK_SIZE	(1 << EXT2_MAX_BLOCK_LOG_SIZE)
b837a6
+#ifdef __KERNEL__
b837a6
+#define EXT2_BLOCK_SIZE(s)	((s)->s_blocksize)
b837a6
+#define EXT2_BLOCK_SIZE_BITS(s)	((s)->s_blocksize_bits)
b837a6
+#define EXT2_ADDR_PER_BLOCK_BITS(s)	(EXT2_SB(s)->addr_per_block_bits)
b837a6
+#define EXT2_INODE_SIZE(s)	(EXT2_SB(s)->s_inode_size)
b837a6
+#define EXT2_FIRST_INO(s)	(EXT2_SB(s)->s_first_ino)
b837a6
+#else
b837a6
+#define EXT2_BLOCK_SIZE(s)	(EXT2_MIN_BLOCK_SIZE << (s)->s_log_block_size)
b837a6
+#define EXT2_BLOCK_SIZE_BITS(s)	((s)->s_log_block_size + 10)
b837a6
+#define EXT2_INODE_SIZE(s)	(((s)->s_rev_level == EXT2_GOOD_OLD_REV) ? \
b837a6
+				 EXT2_GOOD_OLD_INODE_SIZE : (s)->s_inode_size)
b837a6
+#define EXT2_FIRST_INO(s)	(((s)->s_rev_level == EXT2_GOOD_OLD_REV) ? \
b837a6
+				 EXT2_GOOD_OLD_FIRST_INO : (s)->s_first_ino)
b837a6
+#endif
b837a6
+#define EXT2_ADDR_PER_BLOCK(s)	(EXT2_BLOCK_SIZE(s) / sizeof(__u32))
b837a6
+
b837a6
+/*
b837a6
+ * Macro-instructions used to manage allocation clusters
b837a6
+ */
b837a6
+#define EXT2_MIN_CLUSTER_LOG_SIZE	EXT2_MIN_BLOCK_LOG_SIZE
b837a6
+#define EXT2_MAX_CLUSTER_LOG_SIZE	29	/* 512MB  */
b837a6
+#define EXT2_MIN_CLUSTER_SIZE		EXT2_MIN_BLOCK_SIZE
b837a6
+#define EXT2_MAX_CLUSTER_SIZE		(1 << EXT2_MAX_CLUSTER_LOG_SIZE)
b837a6
+#define EXT2_CLUSTER_SIZE(s)		(EXT2_MIN_BLOCK_SIZE << \
b837a6
+						(s)->s_log_cluster_size)
b837a6
+#define EXT2_CLUSTER_SIZE_BITS(s)	((s)->s_log_cluster_size + 10)
b837a6
+
b837a6
+/*
b837a6
+ * Macro-instructions used to manage fragments
b837a6
+ *
b837a6
+ * Note: for backwards compatibility only, for the dump program.
b837a6
+ * Ext2/3/4 will never support fragments....
b837a6
+ */
b837a6
+#define EXT2_MIN_FRAG_SIZE              EXT2_MIN_BLOCK_SIZE
b837a6
+#define EXT2_MAX_FRAG_SIZE              EXT2_MAX_BLOCK_SIZE
b837a6
+#define EXT2_MIN_FRAG_LOG_SIZE          EXT2_MIN_BLOCK_LOG_SIZE
b837a6
+#define EXT2_FRAG_SIZE(s)		EXT2_BLOCK_SIZE(s)
b837a6
+#define EXT2_FRAGS_PER_BLOCK(s)		1
b837a6
+
b837a6
+/*
b837a6
+ * ACL structures
b837a6
+ */
b837a6
+struct ext2_acl_header	/* Header of Access Control Lists */
b837a6
+{
b837a6
+	__u32	aclh_size;
b837a6
+	__u32	aclh_file_count;
b837a6
+	__u32	aclh_acle_count;
b837a6
+	__u32	aclh_first_acle;
b837a6
+};
b837a6
+
b837a6
+struct ext2_acl_entry	/* Access Control List Entry */
b837a6
+{
b837a6
+	__u32	acle_size;
b837a6
+	__u16	acle_perms;	/* Access permissions */
b837a6
+	__u16	acle_type;	/* Type of entry */
b837a6
+	__u16	acle_tag;	/* User or group identity */
b837a6
+	__u16	acle_pad1;
b837a6
+	__u32	acle_next;	/* Pointer on next entry for the */
b837a6
+					/* same inode or on next free entry */
b837a6
+};
b837a6
+
b837a6
+/*
b837a6
+ * Structure of a blocks group descriptor
b837a6
+ */
b837a6
+struct ext2_group_desc
b837a6
+{
b837a6
+	__u32	bg_block_bitmap;	/* Blocks bitmap block */
b837a6
+	__u32	bg_inode_bitmap;	/* Inodes bitmap block */
b837a6
+	__u32	bg_inode_table;		/* Inodes table block */
b837a6
+	__u16	bg_free_blocks_count;	/* Free blocks count */
b837a6
+	__u16	bg_free_inodes_count;	/* Free inodes count */
b837a6
+	__u16	bg_used_dirs_count;	/* Directories count */
b837a6
+	__u16	bg_flags;
b837a6
+	__u32	bg_exclude_bitmap_lo;	/* Exclude bitmap for snapshots */
b837a6
+	__u16	bg_block_bitmap_csum_lo;/* crc32c(s_uuid+grp_num+bitmap) LSB */
b837a6
+	__u16	bg_inode_bitmap_csum_lo;/* crc32c(s_uuid+grp_num+bitmap) LSB */
b837a6
+	__u16	bg_itable_unused;	/* Unused inodes count */
b837a6
+	__u16	bg_checksum;		/* crc16(s_uuid+grouo_num+group_desc)*/
b837a6
+};
b837a6
+
b837a6
+/*
b837a6
+ * Structure of a blocks group descriptor
b837a6
+ */
b837a6
+struct ext4_group_desc
b837a6
+{
b837a6
+	__u32	bg_block_bitmap;	/* Blocks bitmap block */
b837a6
+	__u32	bg_inode_bitmap;	/* Inodes bitmap block */
b837a6
+	__u32	bg_inode_table;		/* Inodes table block */
b837a6
+	__u16	bg_free_blocks_count;	/* Free blocks count */
b837a6
+	__u16	bg_free_inodes_count;	/* Free inodes count */
b837a6
+	__u16	bg_used_dirs_count;	/* Directories count */
b837a6
+	__u16	bg_flags;		/* EXT4_BG_flags (INODE_UNINIT, etc) */
b837a6
+	__u32	bg_exclude_bitmap_lo;	/* Exclude bitmap for snapshots */
b837a6
+	__u16	bg_block_bitmap_csum_lo;/* crc32c(s_uuid+grp_num+bitmap) LSB */
b837a6
+	__u16	bg_inode_bitmap_csum_lo;/* crc32c(s_uuid+grp_num+bitmap) LSB */
b837a6
+	__u16	bg_itable_unused;	/* Unused inodes count */
b837a6
+	__u16	bg_checksum;		/* crc16(sb_uuid+group+desc) */
b837a6
+	__u32	bg_block_bitmap_hi;	/* Blocks bitmap block MSB */
b837a6
+	__u32	bg_inode_bitmap_hi;	/* Inodes bitmap block MSB */
b837a6
+	__u32	bg_inode_table_hi;	/* Inodes table block MSB */
b837a6
+	__u16	bg_free_blocks_count_hi;/* Free blocks count MSB */
b837a6
+	__u16	bg_free_inodes_count_hi;/* Free inodes count MSB */
b837a6
+	__u16	bg_used_dirs_count_hi;	/* Directories count MSB */
b837a6
+	__u16	bg_itable_unused_hi;	/* Unused inodes count MSB */
b837a6
+	__u32	bg_exclude_bitmap_hi;	/* Exclude bitmap block MSB */
b837a6
+	__u16	bg_block_bitmap_csum_hi;/* crc32c(s_uuid+grp_num+bitmap) MSB */
b837a6
+	__u16	bg_inode_bitmap_csum_hi;/* crc32c(s_uuid+grp_num+bitmap) MSB */
b837a6
+	__u32	bg_reserved;
b837a6
+};
b837a6
+
b837a6
+#define EXT2_BG_INODE_UNINIT	0x0001 /* Inode table/bitmap not initialized */
b837a6
+#define EXT2_BG_BLOCK_UNINIT	0x0002 /* Block bitmap not initialized */
b837a6
+#define EXT2_BG_INODE_ZEROED	0x0004 /* On-disk itable initialized to zero */
b837a6
+
b837a6
+/*
b837a6
+ * Data structures used by the directory indexing feature
b837a6
+ *
b837a6
+ * Note: all of the multibyte integer fields are little endian.
b837a6
+ */
b837a6
+
b837a6
+/*
b837a6
+ * Note: dx_root_info is laid out so that if it should somehow get
b837a6
+ * overlaid by a dirent the two low bits of the hash version will be
b837a6
+ * zero.  Therefore, the hash version mod 4 should never be 0.
b837a6
+ * Sincerely, the paranoia department.
b837a6
+ */
b837a6
+struct ext2_dx_root_info {
b837a6
+	__u32 reserved_zero;
b837a6
+	__u8 hash_version; /* 0 now, 1 at release */
b837a6
+	__u8 info_length; /* 8 */
b837a6
+	__u8 indirect_levels;
b837a6
+	__u8 unused_flags;
b837a6
+};
b837a6
+
b837a6
+#define EXT2_HASH_LEGACY		0
b837a6
+#define EXT2_HASH_HALF_MD4		1
b837a6
+#define EXT2_HASH_TEA			2
b837a6
+#define EXT2_HASH_LEGACY_UNSIGNED	3 /* reserved for userspace lib */
b837a6
+#define EXT2_HASH_HALF_MD4_UNSIGNED	4 /* reserved for userspace lib */
b837a6
+#define EXT2_HASH_TEA_UNSIGNED		5 /* reserved for userspace lib */
b837a6
+
b837a6
+#define EXT2_HASH_FLAG_INCOMPAT	0x1
b837a6
+
b837a6
+struct ext2_dx_entry {
b837a6
+	__u32 hash;
b837a6
+	__u32 block;
b837a6
+};
b837a6
+
b837a6
+struct ext2_dx_countlimit {
b837a6
+	__u16 limit;
b837a6
+	__u16 count;
b837a6
+};
b837a6
+
b837a6
+
b837a6
+/*
b837a6
+ * Macro-instructions used to manage group descriptors
b837a6
+ */
b837a6
+#define EXT2_MIN_DESC_SIZE             32
b837a6
+#define EXT2_MIN_DESC_SIZE_64BIT       64
b837a6
+#define EXT2_MAX_DESC_SIZE             EXT2_MIN_BLOCK_SIZE
b837a6
+#define EXT2_DESC_SIZE(s)                                                \
b837a6
+       ((EXT2_SB(s)->s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT) ? \
b837a6
+	(s)->s_desc_size : EXT2_MIN_DESC_SIZE)
b837a6
+
b837a6
+#define EXT2_BLOCKS_PER_GROUP(s)	(EXT2_SB(s)->s_blocks_per_group)
b837a6
+#define EXT2_INODES_PER_GROUP(s)	(EXT2_SB(s)->s_inodes_per_group)
b837a6
+#define EXT2_CLUSTERS_PER_GROUP(s)	(EXT2_SB(s)->s_clusters_per_group)
b837a6
+#define EXT2_INODES_PER_BLOCK(s)	(EXT2_BLOCK_SIZE(s)/EXT2_INODE_SIZE(s))
b837a6
+/* limits imposed by 16-bit value gd_free_{blocks,inode}_count */
b837a6
+#define EXT2_MAX_BLOCKS_PER_GROUP(s)	((((unsigned) 1 << 16) - 8) *	\
b837a6
+					 (EXT2_CLUSTER_SIZE(s) / \
b837a6
+					  EXT2_BLOCK_SIZE(s)))
b837a6
+#define EXT2_MAX_CLUSTERS_PER_GROUP(s)	(((unsigned) 1 << 16) - 8)
b837a6
+#define EXT2_MAX_INODES_PER_GROUP(s)	(((unsigned) 1 << 16) - \
b837a6
+					 EXT2_INODES_PER_BLOCK(s))
b837a6
+#ifdef __KERNEL__
b837a6
+#define EXT2_DESC_PER_BLOCK(s)		(EXT2_SB(s)->s_desc_per_block)
b837a6
+#define EXT2_DESC_PER_BLOCK_BITS(s)	(EXT2_SB(s)->s_desc_per_block_bits)
b837a6
+#else
b837a6
+#define EXT2_DESC_PER_BLOCK(s)		(EXT2_BLOCK_SIZE(s) / EXT2_DESC_SIZE(s))
b837a6
+#endif
b837a6
+
b837a6
+/*
b837a6
+ * Constants relative to the data blocks
b837a6
+ */
b837a6
+#define EXT2_NDIR_BLOCKS		12
b837a6
+#define EXT2_IND_BLOCK			EXT2_NDIR_BLOCKS
b837a6
+#define EXT2_DIND_BLOCK			(EXT2_IND_BLOCK + 1)
b837a6
+#define EXT2_TIND_BLOCK			(EXT2_DIND_BLOCK + 1)
b837a6
+#define EXT2_N_BLOCKS			(EXT2_TIND_BLOCK + 1)
b837a6
+
b837a6
+/*
b837a6
+ * Inode flags
b837a6
+ */
b837a6
+#define EXT2_SECRM_FL			0x00000001 /* Secure deletion */
b837a6
+#define EXT2_UNRM_FL			0x00000002 /* Undelete */
b837a6
+#define EXT2_COMPR_FL			0x00000004 /* Compress file */
b837a6
+#define EXT2_SYNC_FL			0x00000008 /* Synchronous updates */
b837a6
+#define EXT2_IMMUTABLE_FL		0x00000010 /* Immutable file */
b837a6
+#define EXT2_APPEND_FL			0x00000020 /* writes to file may only append */
b837a6
+#define EXT2_NODUMP_FL			0x00000040 /* do not dump file */
b837a6
+#define EXT2_NOATIME_FL			0x00000080 /* do not update atime */
b837a6
+/* Reserved for compression usage... */
b837a6
+#define EXT2_DIRTY_FL			0x00000100
b837a6
+#define EXT2_COMPRBLK_FL		0x00000200 /* One or more compressed clusters */
b837a6
+#define EXT2_NOCOMPR_FL			0x00000400 /* Access raw compressed data */
b837a6
+#define EXT2_ECOMPR_FL			0x00000800 /* Compression error */
b837a6
+/* End compression flags --- maybe not all used */
b837a6
+#define EXT2_BTREE_FL			0x00001000 /* btree format dir */
b837a6
+#define EXT2_INDEX_FL			0x00001000 /* hash-indexed directory */
b837a6
+#define EXT2_IMAGIC_FL			0x00002000
b837a6
+#define EXT3_JOURNAL_DATA_FL		0x00004000 /* file data should be journaled */
b837a6
+#define EXT2_NOTAIL_FL			0x00008000 /* file tail should not be merged */
b837a6
+#define EXT2_DIRSYNC_FL 		0x00010000 /* Synchronous directory modifications */
b837a6
+#define EXT2_TOPDIR_FL			0x00020000 /* Top of directory hierarchies*/
b837a6
+#define EXT4_HUGE_FILE_FL               0x00040000 /* Set to each huge file */
b837a6
+#define EXT4_EXTENTS_FL 		0x00080000 /* Inode uses extents */
b837a6
+#define EXT4_EA_INODE_FL	        0x00200000 /* Inode used for large EA */
b837a6
+/* EXT4_EOFBLOCKS_FL 0x00400000 was here */
b837a6
+#define EXT4_SNAPFILE_FL		0x01000000  /* Inode is a snapshot */
b837a6
+#define EXT4_SNAPFILE_DELETED_FL	0x04000000  /* Snapshot is being deleted */
b837a6
+#define EXT4_SNAPFILE_SHRUNK_FL		0x08000000  /* Snapshot shrink has completed */
b837a6
+#define EXT2_RESERVED_FL		0x80000000 /* reserved for ext2 lib */
b837a6
+
b837a6
+#define EXT2_FL_USER_VISIBLE		0x004BDFFF /* User visible flags */
b837a6
+#define EXT2_FL_USER_MODIFIABLE		0x004B80FF /* User modifiable flags */
b837a6
+
b837a6
+/*
b837a6
+ * ioctl commands
b837a6
+ */
b837a6
+
b837a6
+/* Used for online resize */
b837a6
+struct ext2_new_group_input {
b837a6
+	__u32 group;		/* Group number for this data */
b837a6
+	__u32 block_bitmap;	/* Absolute block number of block bitmap */
b837a6
+	__u32 inode_bitmap;	/* Absolute block number of inode bitmap */
b837a6
+	__u32 inode_table;	/* Absolute block number of inode table start */
b837a6
+	__u32 blocks_count;	/* Total number of blocks in this group */
b837a6
+	__u16 reserved_blocks;	/* Number of reserved blocks in this group */
b837a6
+	__u16 unused;		/* Number of reserved GDT blocks in group */
b837a6
+};
b837a6
+
b837a6
+struct ext4_new_group_input {
b837a6
+	__u32 group;		/* Group number for this data */
b837a6
+	__u64 block_bitmap;	/* Absolute block number of block bitmap */
b837a6
+	__u64 inode_bitmap;	/* Absolute block number of inode bitmap */
b837a6
+	__u64 inode_table;	/* Absolute block number of inode table start */
b837a6
+	__u32 blocks_count;	/* Total number of blocks in this group */
b837a6
+	__u16 reserved_blocks;	/* Number of reserved blocks in this group */
b837a6
+	__u16 unused;
b837a6
+};
b837a6
+
b837a6
+#ifdef __GNU__			/* Needed for the Hurd */
b837a6
+#define _IOT_ext2_new_group_input _IOT (_IOTS(__u32), 5, _IOTS(__u16), 2, 0, 0)
b837a6
+#endif
b837a6
+
b837a6
+#define EXT2_IOC_GETFLAGS		_IOR('f', 1, long)
b837a6
+#define EXT2_IOC_SETFLAGS		_IOW('f', 2, long)
b837a6
+#define EXT2_IOC_GETVERSION		_IOR('v', 1, long)
b837a6
+#define EXT2_IOC_SETVERSION		_IOW('v', 2, long)
b837a6
+#define EXT2_IOC_GETVERSION_NEW		_IOR('f', 3, long)
b837a6
+#define EXT2_IOC_SETVERSION_NEW		_IOW('f', 4, long)
b837a6
+#define EXT2_IOC_GROUP_EXTEND		_IOW('f', 7, unsigned long)
b837a6
+#define EXT2_IOC_GROUP_ADD		_IOW('f', 8,struct ext2_new_group_input)
b837a6
+#define EXT4_IOC_GROUP_ADD		_IOW('f', 8,struct ext4_new_group_input)
b837a6
+#define EXT4_IOC_RESIZE_FS		_IOW('f', 16, __u64)
b837a6
+
b837a6
+/*
b837a6
+ * Structure of an inode on the disk
b837a6
+ */
b837a6
+struct ext2_inode {
b837a6
+	__u16	i_mode;		/* File mode */
b837a6
+	__u16	i_uid;		/* Low 16 bits of Owner Uid */
b837a6
+	__u32	i_size;		/* Size in bytes */
b837a6
+	__u32	i_atime;	/* Access time */
b837a6
+	__u32	i_ctime;	/* Inode change time */
b837a6
+	__u32	i_mtime;	/* Modification time */
b837a6
+	__u32	i_dtime;	/* Deletion Time */
b837a6
+	__u16	i_gid;		/* Low 16 bits of Group Id */
b837a6
+	__u16	i_links_count;	/* Links count */
b837a6
+	__u32	i_blocks;	/* Blocks count */
b837a6
+	__u32	i_flags;	/* File flags */
b837a6
+	union {
b837a6
+		struct {
b837a6
+			__u32	l_i_version; /* was l_i_reserved1 */
b837a6
+		} linux1;
b837a6
+		struct {
b837a6
+			__u32  h_i_translator;
b837a6
+		} hurd1;
b837a6
+	} osd1;				/* OS dependent 1 */
b837a6
+	__u32	i_block[EXT2_N_BLOCKS];/* Pointers to blocks */
b837a6
+	__u32	i_generation;	/* File version (for NFS) */
b837a6
+	__u32	i_file_acl;	/* File ACL */
b837a6
+	__u32	i_size_high;	/* Formerly i_dir_acl, directory ACL */
b837a6
+	__u32	i_faddr;	/* Fragment address */
b837a6
+	union {
b837a6
+		struct {
b837a6
+			__u16	l_i_blocks_hi;
b837a6
+			__u16	l_i_file_acl_high;
b837a6
+			__u16	l_i_uid_high;	/* these 2 fields    */
b837a6
+			__u16	l_i_gid_high;	/* were reserved2[0] */
b837a6
+			__u16	l_i_checksum_lo; /* crc32c(uuid+inum+inode) */
b837a6
+			__u16	l_i_reserved;
b837a6
+		} linux2;
b837a6
+		struct {
b837a6
+			__u8	h_i_frag;	/* Fragment number */
b837a6
+			__u8	h_i_fsize;	/* Fragment size */
b837a6
+			__u16	h_i_mode_high;
b837a6
+			__u16	h_i_uid_high;
b837a6
+			__u16	h_i_gid_high;
b837a6
+			__u32	h_i_author;
b837a6
+		} hurd2;
b837a6
+	} osd2;				/* OS dependent 2 */
b837a6
+};
b837a6
+
b837a6
+/*
b837a6
+ * Permanent part of an large inode on the disk
b837a6
+ */
b837a6
+struct ext2_inode_large {
b837a6
+	__u16	i_mode;		/* File mode */
b837a6
+	__u16	i_uid;		/* Low 16 bits of Owner Uid */
b837a6
+	__u32	i_size;		/* Size in bytes */
b837a6
+	__u32	i_atime;	/* Access time */
b837a6
+	__u32	i_ctime;	/* Inode Change time */
b837a6
+	__u32	i_mtime;	/* Modification time */
b837a6
+	__u32	i_dtime;	/* Deletion Time */
b837a6
+	__u16	i_gid;		/* Low 16 bits of Group Id */
b837a6
+	__u16	i_links_count;	/* Links count */
b837a6
+	__u32	i_blocks;	/* Blocks count */
b837a6
+	__u32	i_flags;	/* File flags */
b837a6
+	union {
b837a6
+		struct {
b837a6
+			__u32	l_i_version; /* was l_i_reserved1 */
b837a6
+		} linux1;
b837a6
+		struct {
b837a6
+			__u32  h_i_translator;
b837a6
+		} hurd1;
b837a6
+	} osd1;				/* OS dependent 1 */
b837a6
+	__u32	i_block[EXT2_N_BLOCKS];/* Pointers to blocks */
b837a6
+	__u32	i_generation;	/* File version (for NFS) */
b837a6
+	__u32	i_file_acl;	/* File ACL */
b837a6
+	__u32	i_size_high;	/* Formerly i_dir_acl, directory ACL */
b837a6
+	__u32	i_faddr;	/* Fragment address */
b837a6
+	union {
b837a6
+		struct {
b837a6
+			__u16	l_i_blocks_hi;
b837a6
+			__u16	l_i_file_acl_high;
b837a6
+			__u16	l_i_uid_high;	/* these 2 fields    */
b837a6
+			__u16	l_i_gid_high;	/* were reserved2[0] */
b837a6
+			__u16	l_i_checksum_lo; /* crc32c(uuid+inum+inode) */
b837a6
+			__u16	l_i_reserved;
b837a6
+		} linux2;
b837a6
+		struct {
b837a6
+			__u8	h_i_frag;	/* Fragment number */
b837a6
+			__u8	h_i_fsize;	/* Fragment size */
b837a6
+			__u16	h_i_mode_high;
b837a6
+			__u16	h_i_uid_high;
b837a6
+			__u16	h_i_gid_high;
b837a6
+			__u32	h_i_author;
b837a6
+		} hurd2;
b837a6
+	} osd2;				/* OS dependent 2 */
b837a6
+	__u16	i_extra_isize;
b837a6
+	__u16	i_checksum_hi;	/* crc32c(uuid+inum+inode) */
b837a6
+	__u32	i_ctime_extra;	/* extra Change time (nsec << 2 | epoch) */
b837a6
+	__u32	i_mtime_extra;	/* extra Modification time (nsec << 2 | epoch) */
b837a6
+	__u32	i_atime_extra;	/* extra Access time (nsec << 2 | epoch) */
b837a6
+	__u32	i_crtime;	/* File creation time */
b837a6
+	__u32	i_crtime_extra;	/* extra File creation time (nsec << 2 | epoch)*/
b837a6
+	__u32	i_version_hi;	/* high 32 bits for 64-bit version */
b837a6
+};
b837a6
+
b837a6
+#define i_dir_acl	i_size_high
b837a6
+
b837a6
+#if defined(__KERNEL__) || defined(__linux__)
b837a6
+#define i_reserved1	osd1.linux1.l_i_reserved1
b837a6
+#define i_frag		osd2.linux2.l_i_frag
b837a6
+#define i_fsize		osd2.linux2.l_i_fsize
b837a6
+#define i_uid_low	i_uid
b837a6
+#define i_gid_low	i_gid
b837a6
+#define i_uid_high	osd2.linux2.l_i_uid_high
b837a6
+#define i_gid_high	osd2.linux2.l_i_gid_high
b837a6
+#else
b837a6
+#if defined(__GNU__)
b837a6
+
b837a6
+#define i_translator	osd1.hurd1.h_i_translator
b837a6
+#define i_frag		osd2.hurd2.h_i_frag;
b837a6
+#define i_fsize		osd2.hurd2.h_i_fsize;
b837a6
+#define i_uid_high	osd2.hurd2.h_i_uid_high
b837a6
+#define i_gid_high	osd2.hurd2.h_i_gid_high
b837a6
+#define i_author	osd2.hurd2.h_i_author
b837a6
+
b837a6
+#endif  /* __GNU__ */
b837a6
+#endif	/* defined(__KERNEL__) || defined(__linux__) */
b837a6
+
b837a6
+#define inode_uid(inode)	((inode).i_uid | (inode).osd2.linux2.l_i_uid_high << 16)
b837a6
+#define inode_gid(inode)	((inode).i_gid | (inode).osd2.linux2.l_i_gid_high << 16)
b837a6
+#define ext2fs_set_i_uid_high(inode,x) ((inode).osd2.linux2.l_i_uid_high = (x))
b837a6
+#define ext2fs_set_i_gid_high(inode,x) ((inode).osd2.linux2.l_i_gid_high = (x))
b837a6
+
b837a6
+/*
b837a6
+ * File system states
b837a6
+ */
b837a6
+#define EXT2_VALID_FS			0x0001	/* Unmounted cleanly */
b837a6
+#define EXT2_ERROR_FS			0x0002	/* Errors detected */
b837a6
+#define EXT3_ORPHAN_FS			0x0004	/* Orphans being recovered */
b837a6
+
b837a6
+/*
b837a6
+ * Misc. filesystem flags
b837a6
+ */
b837a6
+#define EXT2_FLAGS_SIGNED_HASH		0x0001  /* Signed dirhash in use */
b837a6
+#define EXT2_FLAGS_UNSIGNED_HASH	0x0002  /* Unsigned dirhash in use */
b837a6
+#define EXT2_FLAGS_TEST_FILESYS		0x0004	/* OK for use on development code */
b837a6
+#define EXT2_FLAGS_IS_SNAPSHOT		0x0010	/* This is a snapshot image */
b837a6
+#define EXT2_FLAGS_FIX_SNAPSHOT		0x0020	/* Snapshot inodes corrupted */
b837a6
+#define EXT2_FLAGS_FIX_EXCLUDE		0x0040	/* Exclude bitmaps corrupted */
b837a6
+
b837a6
+/*
b837a6
+ * Mount flags
b837a6
+ */
b837a6
+#define EXT2_MOUNT_CHECK		0x0001	/* Do mount-time checks */
b837a6
+#define EXT2_MOUNT_GRPID		0x0004	/* Create files with directory's group */
b837a6
+#define EXT2_MOUNT_DEBUG		0x0008	/* Some debugging messages */
b837a6
+#define EXT2_MOUNT_ERRORS_CONT		0x0010	/* Continue on errors */
b837a6
+#define EXT2_MOUNT_ERRORS_RO		0x0020	/* Remount fs ro on errors */
b837a6
+#define EXT2_MOUNT_ERRORS_PANIC		0x0040	/* Panic on errors */
b837a6
+#define EXT2_MOUNT_MINIX_DF		0x0080	/* Mimics the Minix statfs */
b837a6
+#define EXT2_MOUNT_NO_UID32		0x0200  /* Disable 32-bit UIDs */
b837a6
+
b837a6
+#define clear_opt(o, opt)		o &= ~EXT2_MOUNT_##opt
b837a6
+#define set_opt(o, opt)			o |= EXT2_MOUNT_##opt
b837a6
+#define test_opt(sb, opt)		(EXT2_SB(sb)->s_mount_opt & \
b837a6
+					 EXT2_MOUNT_##opt)
b837a6
+/*
b837a6
+ * Maximal mount counts between two filesystem checks
b837a6
+ */
b837a6
+#define EXT2_DFL_MAX_MNT_COUNT		20	/* Allow 20 mounts */
b837a6
+#define EXT2_DFL_CHECKINTERVAL		0	/* Don't use interval check */
b837a6
+
b837a6
+/*
b837a6
+ * Behaviour when detecting errors
b837a6
+ */
b837a6
+#define EXT2_ERRORS_CONTINUE		1	/* Continue execution */
b837a6
+#define EXT2_ERRORS_RO			2	/* Remount fs read-only */
b837a6
+#define EXT2_ERRORS_PANIC		3	/* Panic */
b837a6
+#define EXT2_ERRORS_DEFAULT		EXT2_ERRORS_CONTINUE
b837a6
+
b837a6
+#if (__GNUC__ >= 4)
b837a6
+#define ext4_offsetof(TYPE,MEMBER) __builtin_offsetof(TYPE,MEMBER)
b837a6
+#else
b837a6
+#define ext4_offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
b837a6
+#endif
b837a6
+
b837a6
+/*
b837a6
+ * Structure of the super block
b837a6
+ */
b837a6
+struct ext2_super_block {
b837a6
+	__u32	s_inodes_count;		/* Inodes count */
b837a6
+	__u32	s_blocks_count;		/* Blocks count */
b837a6
+	__u32	s_r_blocks_count;	/* Reserved blocks count */
b837a6
+	__u32	s_free_blocks_count;	/* Free blocks count */
b837a6
+	__u32	s_free_inodes_count;	/* Free inodes count */
b837a6
+	__u32	s_first_data_block;	/* First Data Block */
b837a6
+	__u32	s_log_block_size;	/* Block size */
b837a6
+	__u32	s_log_cluster_size;	/* Allocation cluster size */
b837a6
+	__u32	s_blocks_per_group;	/* # Blocks per group */
b837a6
+	__u32	s_clusters_per_group;	/* # Fragments per group */
b837a6
+	__u32	s_inodes_per_group;	/* # Inodes per group */
b837a6
+	__u32	s_mtime;		/* Mount time */
b837a6
+	__u32	s_wtime;		/* Write time */
b837a6
+	__u16	s_mnt_count;		/* Mount count */
b837a6
+	__s16	s_max_mnt_count;	/* Maximal mount count */
b837a6
+	__u16	s_magic;		/* Magic signature */
b837a6
+	__u16	s_state;		/* File system state */
b837a6
+	__u16	s_errors;		/* Behaviour when detecting errors */
b837a6
+	__u16	s_minor_rev_level;	/* minor revision level */
b837a6
+	__u32	s_lastcheck;		/* time of last check */
b837a6
+	__u32	s_checkinterval;	/* max. time between checks */
b837a6
+	__u32	s_creator_os;		/* OS */
b837a6
+	__u32	s_rev_level;		/* Revision level */
b837a6
+	__u16	s_def_resuid;		/* Default uid for reserved blocks */
b837a6
+	__u16	s_def_resgid;		/* Default gid for reserved blocks */
b837a6
+	/*
b837a6
+	 * These fields are for EXT2_DYNAMIC_REV superblocks only.
b837a6
+	 *
b837a6
+	 * Note: the difference between the compatible feature set and
b837a6
+	 * the incompatible feature set is that if there is a bit set
b837a6
+	 * in the incompatible feature set that the kernel doesn't
b837a6
+	 * know about, it should refuse to mount the filesystem.
b837a6
+	 *
b837a6
+	 * e2fsck's requirements are more strict; if it doesn't know
b837a6
+	 * about a feature in either the compatible or incompatible
b837a6
+	 * feature set, it must abort and not try to meddle with
b837a6
+	 * things it doesn't understand...
b837a6
+	 */
b837a6
+	__u32	s_first_ino;		/* First non-reserved inode */
b837a6
+	__u16   s_inode_size;		/* size of inode structure */
b837a6
+	__u16	s_block_group_nr;	/* block group # of this superblock */
b837a6
+	__u32	s_feature_compat;	/* compatible feature set */
b837a6
+	__u32	s_feature_incompat;	/* incompatible feature set */
b837a6
+	__u32	s_feature_ro_compat;	/* readonly-compatible feature set */
b837a6
+	__u8	s_uuid[16];		/* 128-bit uuid for volume */
b837a6
+	char	s_volume_name[16];	/* volume name */
b837a6
+	char	s_last_mounted[64];	/* directory where last mounted */
b837a6
+	__u32	s_algorithm_usage_bitmap; /* For compression */
b837a6
+	/*
b837a6
+	 * Performance hints.  Directory preallocation should only
b837a6
+	 * happen if the EXT2_FEATURE_COMPAT_DIR_PREALLOC flag is on.
b837a6
+	 */
b837a6
+	__u8	s_prealloc_blocks;	/* Nr of blocks to try to preallocate*/
b837a6
+	__u8	s_prealloc_dir_blocks;	/* Nr to preallocate for dirs */
b837a6
+	__u16	s_reserved_gdt_blocks;	/* Per group table for online growth */
b837a6
+	/*
b837a6
+	 * Journaling support valid if EXT2_FEATURE_COMPAT_HAS_JOURNAL set.
b837a6
+	 */
b837a6
+	__u8	s_journal_uuid[16];	/* uuid of journal superblock */
b837a6
+	__u32	s_journal_inum;		/* inode number of journal file */
b837a6
+	__u32	s_journal_dev;		/* device number of journal file */
b837a6
+	__u32	s_last_orphan;		/* start of list of inodes to delete */
b837a6
+	__u32	s_hash_seed[4];		/* HTREE hash seed */
b837a6
+	__u8	s_def_hash_version;	/* Default hash version to use */
b837a6
+	__u8	s_jnl_backup_type; 	/* Default type of journal backup */
b837a6
+	__u16	s_desc_size;		/* Group desc. size: INCOMPAT_64BIT */
b837a6
+	__u32	s_default_mount_opts;
b837a6
+	__u32	s_first_meta_bg;	/* First metablock group */
b837a6
+	__u32	s_mkfs_time;		/* When the filesystem was created */
b837a6
+	__u32	s_jnl_blocks[17]; 	/* Backup of the journal inode */
b837a6
+	__u32	s_blocks_count_hi;	/* Blocks count high 32bits */
b837a6
+	__u32	s_r_blocks_count_hi;	/* Reserved blocks count high 32 bits*/
b837a6
+	__u32	s_free_blocks_hi; 	/* Free blocks count */
b837a6
+	__u16	s_min_extra_isize;	/* All inodes have at least # bytes */
b837a6
+	__u16	s_want_extra_isize; 	/* New inodes should reserve # bytes */
b837a6
+	__u32	s_flags;		/* Miscellaneous flags */
b837a6
+	__u16   s_raid_stride;		/* RAID stride */
b837a6
+	__u16   s_mmp_update_interval;  /* # seconds to wait in MMP checking */
b837a6
+	__u64   s_mmp_block;            /* Block for multi-mount protection */
b837a6
+	__u32   s_raid_stripe_width;    /* blocks on all data disks (N*stride)*/
b837a6
+	__u8	s_log_groups_per_flex;	/* FLEX_BG group size */
b837a6
+	__u8    s_reserved_char_pad;
b837a6
+	__u16	s_reserved_pad;		/* Padding to next 32bits */
b837a6
+	__u64	s_kbytes_written;	/* nr of lifetime kilobytes written */
b837a6
+	__u32	s_snapshot_inum;	/* Inode number of active snapshot */
b837a6
+	__u32	s_snapshot_id;		/* sequential ID of active snapshot */
b837a6
+	__u64	s_snapshot_r_blocks_count; /* reserved blocks for active
b837a6
+					      snapshot's future use */
b837a6
+	__u32	s_snapshot_list;	/* inode number of the head of the on-disk snapshot list */
b837a6
+#define EXT4_S_ERR_START ext4_offsetof(struct ext2_super_block, s_error_count)
b837a6
+	__u32	s_error_count;		/* number of fs errors */
b837a6
+	__u32	s_first_error_time;	/* first time an error happened */
b837a6
+	__u32	s_first_error_ino;	/* inode involved in first error */
b837a6
+	__u64	s_first_error_block;	/* block involved of first error */
b837a6
+	__u8	s_first_error_func[32];	/* function where the error happened */
b837a6
+	__u32	s_first_error_line;	/* line number where error happened */
b837a6
+	__u32	s_last_error_time;	/* most recent time of an error */
b837a6
+	__u32	s_last_error_ino;	/* inode involved in last error */
b837a6
+	__u32	s_last_error_line;	/* line number where error happened */
b837a6
+	__u64	s_last_error_block;	/* block involved of last error */
b837a6
+	__u8	s_last_error_func[32];	/* function where the error happened */
b837a6
+#define EXT4_S_ERR_END ext4_offsetof(struct ext2_super_block, s_mount_opts)
b837a6
+	__u8	s_mount_opts[64];
b837a6
+	__u32	s_usr_quota_inum;	/* inode number of user quota file */
b837a6
+	__u32	s_grp_quota_inum;	/* inode number of group quota file */
b837a6
+	__u32	s_overhead_blocks;	/* overhead blocks/clusters in fs */
b837a6
+	__u32   s_reserved[108];        /* Padding to the end of the block */
b837a6
+	__u32	s_checksum;		/* crc32c(superblock) */
b837a6
+};
b837a6
+
b837a6
+#define EXT4_S_ERR_LEN (EXT4_S_ERR_END - EXT4_S_ERR_START)
b837a6
+
b837a6
+/*
b837a6
+ * Codes for operating systems
b837a6
+ */
b837a6
+#define EXT2_OS_LINUX		0
b837a6
+#define EXT2_OS_HURD		1
b837a6
+#define EXT2_OBSO_OS_MASIX	2
b837a6
+#define EXT2_OS_FREEBSD		3
b837a6
+#define EXT2_OS_LITES		4
b837a6
+
b837a6
+/*
b837a6
+ * Revision levels
b837a6
+ */
b837a6
+#define EXT2_GOOD_OLD_REV	0	/* The good old (original) format */
b837a6
+#define EXT2_DYNAMIC_REV	1	/* V2 format w/ dynamic inode sizes */
b837a6
+
b837a6
+#define EXT2_CURRENT_REV	EXT2_GOOD_OLD_REV
b837a6
+#define EXT2_MAX_SUPP_REV	EXT2_DYNAMIC_REV
b837a6
+
b837a6
+#define EXT2_GOOD_OLD_INODE_SIZE 128
b837a6
+
b837a6
+/*
b837a6
+ * Journal inode backup types
b837a6
+ */
b837a6
+#define EXT3_JNL_BACKUP_BLOCKS	1
b837a6
+
b837a6
+/*
b837a6
+ * Feature set definitions
b837a6
+ */
b837a6
+
b837a6
+#define EXT2_HAS_COMPAT_FEATURE(sb,mask)			\
b837a6
+	( EXT2_SB(sb)->s_feature_compat & (mask) )
b837a6
+#define EXT2_HAS_RO_COMPAT_FEATURE(sb,mask)			\
b837a6
+	( EXT2_SB(sb)->s_feature_ro_compat & (mask) )
b837a6
+#define EXT2_HAS_INCOMPAT_FEATURE(sb,mask)			\
b837a6
+	( EXT2_SB(sb)->s_feature_incompat & (mask) )
b837a6
+
b837a6
+#define EXT2_FEATURE_COMPAT_DIR_PREALLOC	0x0001
b837a6
+#define EXT2_FEATURE_COMPAT_IMAGIC_INODES	0x0002
b837a6
+#define EXT3_FEATURE_COMPAT_HAS_JOURNAL		0x0004
b837a6
+#define EXT2_FEATURE_COMPAT_EXT_ATTR		0x0008
b837a6
+#define EXT2_FEATURE_COMPAT_RESIZE_INODE	0x0010
b837a6
+#define EXT2_FEATURE_COMPAT_DIR_INDEX		0x0020
b837a6
+#define EXT2_FEATURE_COMPAT_LAZY_BG		0x0040
b837a6
+/* #define EXT2_FEATURE_COMPAT_EXCLUDE_INODE	0x0080 not used, legacy */
b837a6
+#define EXT2_FEATURE_COMPAT_EXCLUDE_BITMAP	0x0100
b837a6
+
b837a6
+
b837a6
+#define EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER	0x0001
b837a6
+#define EXT2_FEATURE_RO_COMPAT_LARGE_FILE	0x0002
b837a6
+/* #define EXT2_FEATURE_RO_COMPAT_BTREE_DIR	0x0004 not used */
b837a6
+#define EXT4_FEATURE_RO_COMPAT_HUGE_FILE	0x0008
b837a6
+#define EXT4_FEATURE_RO_COMPAT_GDT_CSUM		0x0010
b837a6
+#define EXT4_FEATURE_RO_COMPAT_DIR_NLINK	0x0020
b837a6
+#define EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE	0x0040
b837a6
+#define EXT4_FEATURE_RO_COMPAT_HAS_SNAPSHOT	0x0080
b837a6
+#define EXT4_FEATURE_RO_COMPAT_QUOTA		0x0100
b837a6
+#define EXT4_FEATURE_RO_COMPAT_BIGALLOC		0x0200
b837a6
+#define EXT4_FEATURE_RO_COMPAT_METADATA_CSUM	0x0400
b837a6
+#define EXT4_FEATURE_RO_COMPAT_REPLICA		0x0800
b837a6
+
b837a6
+#define EXT2_FEATURE_INCOMPAT_COMPRESSION	0x0001
b837a6
+#define EXT2_FEATURE_INCOMPAT_FILETYPE		0x0002
b837a6
+#define EXT3_FEATURE_INCOMPAT_RECOVER		0x0004 /* Needs recovery */
b837a6
+#define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV	0x0008 /* Journal device */
b837a6
+#define EXT2_FEATURE_INCOMPAT_META_BG		0x0010
b837a6
+#define EXT3_FEATURE_INCOMPAT_EXTENTS		0x0040
b837a6
+#define EXT4_FEATURE_INCOMPAT_64BIT		0x0080
b837a6
+#define EXT4_FEATURE_INCOMPAT_MMP		0x0100
b837a6
+#define EXT4_FEATURE_INCOMPAT_FLEX_BG		0x0200
b837a6
+#define EXT4_FEATURE_INCOMPAT_EA_INODE		0x0400
b837a6
+#define EXT4_FEATURE_INCOMPAT_DIRDATA		0x1000
b837a6
+
b837a6
+#define EXT2_FEATURE_COMPAT_SUPP	0
b837a6
+#define EXT2_FEATURE_INCOMPAT_SUPP    (EXT2_FEATURE_INCOMPAT_FILETYPE| \
b837a6
+				       EXT4_FEATURE_INCOMPAT_MMP)
b837a6
+#define EXT2_FEATURE_RO_COMPAT_SUPP	(EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER| \
b837a6
+					 EXT2_FEATURE_RO_COMPAT_LARGE_FILE| \
b837a6
+					 EXT4_FEATURE_RO_COMPAT_DIR_NLINK| \
b837a6
+					 EXT2_FEATURE_RO_COMPAT_BTREE_DIR)
b837a6
+
b837a6
+/*
b837a6
+ * Default values for user and/or group using reserved blocks
b837a6
+ */
b837a6
+#define EXT2_DEF_RESUID		0
b837a6
+#define EXT2_DEF_RESGID		0
b837a6
+
b837a6
+/*
b837a6
+ * Default mount options
b837a6
+ */
b837a6
+#define EXT2_DEFM_DEBUG		0x0001
b837a6
+#define EXT2_DEFM_BSDGROUPS	0x0002
b837a6
+#define EXT2_DEFM_XATTR_USER	0x0004
b837a6
+#define EXT2_DEFM_ACL		0x0008
b837a6
+#define EXT2_DEFM_UID16		0x0010
b837a6
+#define EXT3_DEFM_JMODE		0x0060
b837a6
+#define EXT3_DEFM_JMODE_DATA	0x0020
b837a6
+#define EXT3_DEFM_JMODE_ORDERED	0x0040
b837a6
+#define EXT3_DEFM_JMODE_WBACK	0x0060
b837a6
+#define EXT4_DEFM_NOBARRIER	0x0100
b837a6
+#define EXT4_DEFM_BLOCK_VALIDITY 0x0200
b837a6
+#define EXT4_DEFM_DISCARD	0x0400
b837a6
+#define EXT4_DEFM_NODELALLOC	0x0800
b837a6
+
b837a6
+/*
b837a6
+ * Structure of a directory entry
b837a6
+ */
b837a6
+#define EXT2_NAME_LEN 255
b837a6
+
b837a6
+struct ext2_dir_entry {
b837a6
+	__u32	inode;			/* Inode number */
b837a6
+	__u16	rec_len;		/* Directory entry length */
b837a6
+	__u16	name_len;		/* Name length */
b837a6
+	char	name[EXT2_NAME_LEN];	/* File name */
b837a6
+};
b837a6
+
b837a6
+/*
b837a6
+ * The new version of the directory entry.  Since EXT2 structures are
b837a6
+ * stored in intel byte order, and the name_len field could never be
b837a6
+ * bigger than 255 chars, it's safe to reclaim the extra byte for the
b837a6
+ * file_type field.
b837a6
+ */
b837a6
+struct ext2_dir_entry_2 {
b837a6
+	__u32	inode;			/* Inode number */
b837a6
+	__u16	rec_len;		/* Directory entry length */
b837a6
+	__u8	name_len;		/* Name length */
b837a6
+	__u8	file_type;
b837a6
+	char	name[EXT2_NAME_LEN];	/* File name */
b837a6
+};
b837a6
+
b837a6
+/*
b837a6
+ * Ext2 directory file types.  Only the low 3 bits are used.  The
b837a6
+ * other bits are reserved for now.
b837a6
+ */
b837a6
+#define EXT2_FT_UNKNOWN		0
b837a6
+#define EXT2_FT_REG_FILE	1
b837a6
+#define EXT2_FT_DIR		2
b837a6
+#define EXT2_FT_CHRDEV		3
b837a6
+#define EXT2_FT_BLKDEV		4
b837a6
+#define EXT2_FT_FIFO		5
b837a6
+#define EXT2_FT_SOCK		6
b837a6
+#define EXT2_FT_SYMLINK		7
b837a6
+
b837a6
+#define EXT2_FT_MAX		8
b837a6
+
b837a6
+/*
b837a6
+ * EXT2_DIR_PAD defines the directory entries boundaries
b837a6
+ *
b837a6
+ * NOTE: It must be a multiple of 4
b837a6
+ */
b837a6
+#define EXT2_DIR_PAD			4
b837a6
+#define EXT2_DIR_ROUND			(EXT2_DIR_PAD - 1)
b837a6
+#define EXT2_DIR_REC_LEN(name_len)	(((name_len) + 8 + EXT2_DIR_ROUND) & \
b837a6
+					 ~EXT2_DIR_ROUND)
b837a6
+
b837a6
+/*
b837a6
+ * This structure is used for multiple mount protection. It is written
b837a6
+ * into the block number saved in the s_mmp_block field in the superblock.
b837a6
+ * Programs that check MMP should assume that if SEQ_FSCK (or any unknown
b837a6
+ * code above SEQ_MAX) is present then it is NOT safe to use the filesystem,
b837a6
+ * regardless of how old the timestamp is.
b837a6
+ *
b837a6
+ * The timestamp in the MMP structure will be updated by e2fsck at some
b837a6
+ * arbitary intervals (start of passes, after every few groups of inodes
b837a6
+ * in pass1 and pass1b).  There is no guarantee that e2fsck is updating
b837a6
+ * the MMP block in a timely manner, and the updates it does are purely
b837a6
+ * for the convenience of the sysadmin and not for automatic validation.
b837a6
+ *
b837a6
+ * Note: Only the mmp_seq value is used to determine whether the MMP block
b837a6
+ *	is being updated.  The mmp_time, mmp_nodename, and mmp_bdevname
b837a6
+ *	fields are only for informational purposes for the administrator,
b837a6
+ *	due to clock skew between nodes and hostname HA service takeover.
b837a6
+ */
b837a6
+#define EXT4_MMP_MAGIC     0x004D4D50U /* ASCII for MMP */
b837a6
+#define EXT4_MMP_SEQ_CLEAN 0xFF4D4D50U /* mmp_seq value for clean unmount */
b837a6
+#define EXT4_MMP_SEQ_FSCK  0xE24D4D50U /* mmp_seq value when being fscked */
b837a6
+#define EXT4_MMP_SEQ_MAX   0xE24D4D4FU /* maximum valid mmp_seq value */
b837a6
+
b837a6
+struct mmp_struct {
b837a6
+	__u32	mmp_magic;		/* Magic number for MMP */
b837a6
+	__u32	mmp_seq;		/* Sequence no. updated periodically */
b837a6
+	__u64	mmp_time;		/* Time last updated */
b837a6
+	char	mmp_nodename[64];	/* Node which last updated MMP block */
b837a6
+	char	mmp_bdevname[32];	/* Bdev which last updated MMP block */
b837a6
+	__u16	mmp_check_interval;	/* Changed mmp_check_interval */
b837a6
+	__u16	mmp_pad1;
b837a6
+	__u32	mmp_pad2[227];
b837a6
+};
b837a6
+
b837a6
+/*
b837a6
+ * Default interval for MMP update in seconds.
b837a6
+ */
b837a6
+#define EXT4_MMP_UPDATE_INTERVAL	5
b837a6
+
b837a6
+/*
b837a6
+ * Maximum interval for MMP update in seconds.
b837a6
+ */
b837a6
+#define EXT4_MMP_MAX_UPDATE_INTERVAL	300
b837a6
+
b837a6
+/*
b837a6
+ * Minimum interval for MMP checking in seconds.
b837a6
+ */
b837a6
+#define EXT4_MMP_MIN_CHECK_INTERVAL     5
b837a6
+
b837a6
+#endif	/* _EXT2FS_EXT2_FS_H */
b837a6
diff -urpN syslinux-4.05/libinstaller/linuxioctl.h.ext2 syslinux-4.05/libinstaller/linuxioctl.h
b837a6
--- syslinux-4.05/libinstaller/linuxioctl.h.ext2	2011-12-09 13:28:17.000000000 -0500
b837a6
+++ syslinux-4.05/libinstaller/linuxioctl.h	2012-08-06 09:52:42.653335110 -0400
b837a6
@@ -9,17 +9,33 @@
b837a6
 
b837a6
 #include <sys/ioctl.h>
b837a6
 
b837a6
+#ifdef __linux__
b837a6
+
b837a6
 #define statfs _kernel_statfs	/* HACK to deal with broken 2.4 distros */
b837a6
 
b837a6
 #include <linux/fd.h>		/* Floppy geometry */
b837a6
 #include <linux/hdreg.h>	/* Hard disk geometry */
b837a6
 
b837a6
-#include <linux/fs.h>		/* FIGETBSZ, FIBMAP, FS_IOC_FIEMAP */
b837a6
+#include <linux/fs.h>		/* FIGETBSZ, FIBMAP, FS_IOC_* */
b837a6
 #include <linux/msdos_fs.h>	/* FAT_IOCTL_SET_ATTRIBUTES */
b837a6
 
b837a6
 #undef SECTOR_SIZE		/* Defined in msdos_fs.h for no good reason */
b837a6
 #undef SECTOR_BITS
b837a6
-#include <linux/ext2_fs.h>	/* EXT2_IOC_* */
b837a6
+
b837a6
+#ifndef FS_IOC_GETFLAGS
b837a6
+/* Old kernel headers, these were once ext2-specific... */
b837a6
+# include <linux/ext2_fs.h>	/* EXT2_IOC_* */
b837a6
+
b837a6
+# define FS_IOC_GETFLAGS EXT2_IOC_GETFLAGS
b837a6
+# define FS_IOC_SETFLAGS EXT2_IOC_SETFLAGS
b837a6
+
b837a6
+# define FS_IMMUTABLE_FL EXT2_IMMUTABLE_FL
b837a6
+
b837a6
+#else
b837a6
+
b837a6
+# include <ext2fs/ext2_fs.h>
b837a6
+
b837a6
+#endif
b837a6
 
b837a6
 #ifndef FAT_IOCTL_GET_ATTRIBUTES
b837a6
 # define FAT_IOCTL_GET_ATTRIBUTES	_IOR('r', 0x10, __u32)
b837a6
@@ -37,11 +53,13 @@
b837a6
 
b837a6
 #undef statfs
b837a6
 
b837a6
-#if defined(__linux__) && !defined(BLKGETSIZE64)
b837a6
+#ifndef  BLKGETSIZE64
b837a6
 /* This takes a u64, but the size field says size_t.  Someone screwed big. */
b837a6
 # define BLKGETSIZE64 _IOR(0x12,114,size_t)
b837a6
 #endif
b837a6
 
b837a6
 #include <linux/loop.h>
b837a6
 
b837a6
+#endif /* __linux__ */
b837a6
+
b837a6
 #endif /* LIBINSTALLER_LINUXIOCTL_H */
b837a6
diff -urpN syslinux-4.05/libinstaller/syslxcom.c.ext2 syslinux-4.05/libinstaller/syslxcom.c
b837a6
--- syslinux-4.05/libinstaller/syslxcom.c.ext2	2011-12-09 13:28:17.000000000 -0500
b837a6
+++ syslinux-4.05/libinstaller/syslxcom.c	2012-08-06 09:48:43.797645032 -0400
b837a6
@@ -121,9 +121,9 @@ void clear_attributes(int fd)
b837a6
 	{
b837a6
 	    int flags;
b837a6
 
b837a6
-	    if (!ioctl(fd, EXT2_IOC_GETFLAGS, &flags)) {
b837a6
-		flags &= ~EXT2_IMMUTABLE_FL;
b837a6
-		ioctl(fd, EXT2_IOC_SETFLAGS, &flags);
b837a6
+	    if (!ioctl(fd, FS_IOC_GETFLAGS, &flags)) {
b837a6
+		flags &= ~FS_IMMUTABLE_FL;
b837a6
+		ioctl(fd, FS_IOC_SETFLAGS, &flags);
b837a6
 	    }
b837a6
 	    break;
b837a6
 	}
b837a6
@@ -151,9 +151,9 @@ void set_attributes(int fd)
b837a6
 	{
b837a6
 	    int flags;
b837a6
 
b837a6
-	    if (st.st_uid == 0 && !ioctl(fd, EXT2_IOC_GETFLAGS, &flags)) {
b837a6
-		flags |= EXT2_IMMUTABLE_FL;
b837a6
-		ioctl(fd, EXT2_IOC_SETFLAGS, &flags);
b837a6
+	    if (st.st_uid == 0 && !ioctl(fd, FS_IOC_GETFLAGS, &flags)) {
b837a6
+		flags |= FS_IMMUTABLE_FL;
b837a6
+		ioctl(fd, FS_IOC_SETFLAGS, &flags);
b837a6
 	    }
b837a6
 	    break;
b837a6
 	}