Merge pull request #47 from MaskRay/jbd_commit_header

Fix jbd_commit_header::chksum_{type,size}

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 68a9cb0d2c6aa1e30072c7f4adff11e437207e19..eec0993b08f57f885d04e0d3083047b99f631357 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,8 @@
 project(lwext4 C)
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.4)
 
 
+include_directories(include)
 include_directories(${PROJECT_BINARY_DIR}/include)
 include_directories(blockdev/filedev)
 include_directories(blockdev/filedev_win)
@@ -84,12 +85,6 @@ else()
     set_target_properties(lwext4 PROPERTIES COMPILE_FLAGS "-Wall -Wextra -pedantic")
 endif()
 
-#Config file generation
-file(
-    COPY include
-    DESTINATION .
-)
-
 #DISTRIBUTION
 set(CPACK_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}")
 set(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}")

diff --git a/fs_test/lwext4_server.c b/fs_test/lwext4_server.c
index 2c923baef9285e7dd15111b30a22417e3ba13d13..b65ef3de1958e4c7f305f820028fa3738fddd56d 100644 (file)
--- a/fs_test/lwext4_server.c
+++ b/fs_test/lwext4_server.c
@@ -626,7 +626,7 @@ static int file_read(const char *p)
        return rc;
 }
 
-static int file_write(const const char *p)
+static int file_write(const char *p)
 {
        int fid = MAX_FILES;
        int d;

diff --git a/include/ext4_mkfs.h b/include/ext4_mkfs.h
index 53f1820ab0b307150211e65ade0b72e7f7566d6d..aadedb0d029310492fb55ba66776161c0ec314c4 100644 (file)
--- a/include/ext4_mkfs.h
+++ b/include/ext4_mkfs.h
@@ -58,9 +58,9 @@ struct ext4_mkfs_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;
        uint16_t dsc_size;
        uint8_t uuid[UUID_SIZE];