Fix gcc -Wall warnings in libuuid

[tools/e2fsprogs.git] / lib / ext2fs / ext2_fs.h

diff --git a/lib/ext2fs/ext2_fs.h b/lib/ext2fs/ext2_fs.h
index 896c590..bba5be8 100644 (file)
--- a/lib/ext2fs/ext2_fs.h
+++ b/lib/ext2fs/ext2_fs.h
@@ -173,6 +173,7 @@ struct ext4_group_desc
 
 #define EXT2_BG_INODE_UNINIT   0x0001 /* Inode table/bitmap not initialized */
 #define EXT2_BG_BLOCK_UNINIT   0x0002 /* Block bitmap not initialized */
+#define EXT2_BG_INODE_ZEROED   0x0004 /* On-disk itable initialized to zero */
 
 /*
  * Data structures used by the directory indexing feature
@@ -270,6 +271,7 @@ struct ext2_dx_countlimit {
 #define EXT2_NOTAIL_FL                 0x00008000 /* file tail should not be merged */
 #define EXT2_DIRSYNC_FL                0x00010000 /* Synchronous directory modifications */
 #define EXT2_TOPDIR_FL                 0x00020000 /* Top of directory hierarchies*/
+#define EXT4_HUGE_FILE_FL               0x00040000 /* Set to each huge file */
 #define EXT4_EXTENTS_FL                0x00080000 /* Inode uses extents */
 #define EXT2_RESERVED_FL               0x80000000 /* reserved for ext2 lib */
 
@@ -335,7 +337,7 @@ struct ext2_inode {
        union {
                struct {
                        __u16   l_i_blocks_hi;
-                       __u16   i_pad1;
+                       __u16   l_i_file_acl_high;
                        __u16   l_i_uid_high;   /* these 2 fields    */
                        __u16   l_i_gid_high;   /* were reserved2[0] */
                        __u32   l_i_reserved2;
@@ -382,7 +384,7 @@ struct ext2_inode_large {
        union {
                struct {
                        __u16   l_i_blocks_hi;
-                       __u16   i_pad1;
+                       __u16   l_i_file_acl_high;
                        __u16   l_i_uid_high;   /* these 2 fields    */
                        __u16   l_i_gid_high;   /* were reserved2[0] */
                        __u32   l_i_reserved2;
@@ -403,6 +405,7 @@ struct ext2_inode_large {
        __u32   i_atime_extra;  /* extra Access time (nsec << 2 | epoch) */
        __u32   i_crtime;       /* File creation time */
        __u32   i_crtime_extra; /* extra File creation time (nsec << 2 | epoch)*/
+       __u32   i_version_hi;   /* high 32 bits for 64-bit version */
 };
 
 #define i_size_high    i_dir_acl
@@ -439,7 +442,7 @@ struct ext2_inode_large {
  */
 #define EXT2_VALID_FS                  0x0001  /* Unmounted cleanly */
 #define EXT2_ERROR_FS                  0x0002  /* Errors detected */
-#define EXT4_ORPHAN_FS                 0x0004  /* Orphans being recovered */
+#define EXT3_ORPHAN_FS                 0x0004  /* Orphans being recovered */
 
 /*
  * Misc. filesystem flags
@@ -562,7 +565,10 @@ struct ext2_super_block {
        __u16   s_mmp_interval;         /* # seconds to wait in MMP checking */
        __u64   s_mmp_block;            /* Block for multi-mount protection */
        __u32   s_raid_stripe_width;    /* blocks on all data disks (N*stride)*/
-       __u32   s_reserved[163];        /* Padding to the end of the block */
+       __u8    s_log_groups_per_flex;  /* FLEX_BG group size */
+       __u8    s_reserved_char_pad;
+       __u16   s_reserved_pad;         /* Padding to next 32bits */
+       __u32   s_reserved[162];        /* Padding to the end of the block */
 };
 
 /*
@@ -632,6 +638,7 @@ struct ext2_super_block {
 #define EXT2_FEATURE_INCOMPAT_SUPP     (EXT2_FEATURE_INCOMPAT_FILETYPE)
 #define EXT2_FEATURE_RO_COMPAT_SUPP    (EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER| \
                                         EXT2_FEATURE_RO_COMPAT_LARGE_FILE| \
+                                        EXT4_FEATURE_RO_COMPAT_DIR_NLINK| \
                                         EXT2_FEATURE_RO_COMPAT_BTREE_DIR)
 
 /*