Changeset ff381a7 in mainline for uspace/lib/ext4/libext4_types.h

Timestamp:

2015-11-02T20:54:19Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

d8513177

Parents:

3feeab2 (diff), 5265eea4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/lib/ext4/libext4_types.h (modified) (4 diffs)

uspace/lib/ext4/libext4_types.h

@@ -83 +83 @@
          * happen if the EXT4_FEATURE_COMPAT_DIR_PREALLOC flag is on.
          */
-        uint8_t s_prealloc_blocks;       /* Number of blocks to try to preallocate */
-        uint8_t s_prealloc_dir_blocks;   /* Number to preallocate for dirs */
-        uint16_t s_reserved_gdt_blocks;  /* Per group desc for online growth */
+        uint8_t prealloc_blocks;        /* Number of blocks to try to preallocate */
+        uint8_t prealloc_dir_blocks;    /* Number to preallocate for dirs */
+        uint16_t reserved_gdt_blocks;   /* Per group desc for online growth */
         
         /*
@@ -133 +133 @@
         uint64_t last_error_block;          /* Block involved of last error */
         uint8_t last_error_func[32];        /* Function where the error happened */
-        uint8_t mount_opts[64];
-        uint32_t padding[112];              /* Padding to the end of the block */
+        uint8_t mount_opts[64];             /* String containing the mount options */
+        uint32_t usr_quota_inum;            /* Inode number of user quota file */
+        uint32_t grp_quota_inum;            /* Inode number of group quota file */
+        uint32_t overhead_blocks;           /* Overhead blocks/clusters */
+        uint32_t backup_bgs[2];             /* Block groups containing superblock backups (if SPARSE_SUPER2) */
+        uint32_t encrypt_algos;             /* Encrypt algorithm in use */
+        uint32_t padding[105];              /* Padding to the end of the block */
 } __attribute__((packed)) ext4_superblock_t;
 
@@ -176 +181 @@
 #define EXT4_FEATURE_COMPAT_RESIZE_INODE   0x0010
 #define EXT4_FEATURE_COMPAT_DIR_INDEX      0x0020
+#define EXT4_FEATURE_COMPAT_SPARSE_SUPER2  0x0200
 
 /*
@@ -208 +214 @@
         (EXT4_FEATURE_INCOMPAT_FILETYPE | \
         EXT4_FEATURE_INCOMPAT_EXTENTS | \
-        EXT4_FEATURE_INCOMPAT_64BIT)
+        EXT4_FEATURE_INCOMPAT_64BIT | \
+        EXT4_FEATURE_INCOMPAT_FLEX_BG)
 
 #define EXT4_FEATURE_RO_COMPAT_SUPP \