diff options
author | Tom Cherry <tomcherry@google.com> | 2017-07-14 23:12:05 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-07-14 23:12:05 +0000 |
commit | 4e02dcd7d0e3851b68440b394b923a7b0e9c7ebd (patch) | |
tree | 5b696dbf9b6ca42d836a570c86bc8c57df1d2d4f | |
parent | de07b527133f6f866903062e0cf37091b1d95b54 (diff) | |
parent | 7ce805c97ec0eb915c73cc96ad0bb06bcf8355c0 (diff) | |
download | extras-4e02dcd7d0e3851b68440b394b923a7b0e9c7ebd.tar.gz |
Merge changes from topic 'ext4_encryption_flag'
am: 7ce805c97e
Change-Id: I11917818efdc536b35832116b4bafc7ecbaa29c7
-rw-r--r-- | ext4_utils/include/ext4_utils/ext4_sb.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext4_utils/include/ext4_utils/ext4_sb.h b/ext4_utils/include/ext4_utils/ext4_sb.h index 45e0ec9c..ab8b42f7 100644 --- a/ext4_utils/include/ext4_utils/ext4_sb.h +++ b/ext4_utils/include/ext4_utils/ext4_sb.h @@ -39,9 +39,9 @@ struct fs_info { uint32_t inode_size; uint32_t inodes; uint32_t journal_blocks; - uint16_t feat_ro_compat; - uint16_t feat_compat; - uint16_t feat_incompat; + uint32_t feat_ro_compat; + uint32_t feat_compat; + uint32_t feat_incompat; uint32_t bg_desc_reserve_blocks; const char *label; uint8_t no_journal; |