clang-format: ext4

diff --git a/lwext4/ext4.c b/lwext4/ext4.c
index dfaa5ce8f5f36c46970667c8facbcd69b164c65b..7ea21586ddb2f605b4ee2aef21404d2561cbfa42 100644 (file)
--- a/lwext4/ext4.c
+++ b/lwext4/ext4.c
@@ -51,18 +51,25 @@
 #include <ext4.h>\r
 \r
 /**@brief   Mount point OS dependent lock*/\r
-#define EXT4_MP_LOCK(_m)    \\r
-        do { if((_m)->os_locks)  (_m)->os_locks->lock(); }while(0)\r
+#define EXT4_MP_LOCK(_m)                                                       \\r
+    do {                                                                       \\r
+        if ((_m)->os_locks)                                                    \\r
+            (_m)->os_locks->lock();                                            \\r
+    } while (0)\r
 \r
 /**@brief   Mount point OS dependent unlock*/\r
-#define EXT4_MP_UNLOCK(_m)  \\r
-        do { if((_m)->os_locks)  (_m)->os_locks->unlock(); }while(0)\r
+#define EXT4_MP_UNLOCK(_m)                                                     \\r
+    do {                                                                       \\r
+        if ((_m)->os_locks)                                                    \\r
+            (_m)->os_locks->unlock();                                          \\r
+    } while (0)\r
 \r
 /**@brief   Mount point descrpitor.*/\r
-struct ext4_mountpoint {\r
+struct ext4_mountpoint\r
+{\r
 \r
     /**@brief   Mount done flag.*/\r
-    bool    mounted;\r
+    bool mounted;\r
 \r
     /**@brief   Mount point name (@ref ext4_mount)*/\r
     char name[32];\r
@@ -78,7 +85,8 @@ struct ext4_mountpoint {
 };\r
 \r
 /**@brief   Block devices descriptor.*/\r
-struct _ext4_devices {\r
+struct _ext4_devices\r
+{\r
 \r
     /**@brief   Block device name (@ref ext4_device_register)*/\r
     char name[32];\r
@@ -93,26 +101,24 @@ struct _ext4_devices {
 /**@brief   Block devices.*/\r
 struct _ext4_devices _bdevices[CONFIG_EXT4_BLOCKDEVS_COUNT];\r
 \r
-\r
 /**@brief   Mountpoints.*/\r
 struct ext4_mountpoint _mp[CONFIG_EXT4_MOUNTPOINTS_COUNT];\r
 \r
-\r
 int ext4_device_register(struct ext4_blockdev *bd, struct ext4_bcache *bc,\r
-    const char *dev_name)\r
+                         const char *dev_name)\r
 {\r
     uint32_t i;\r
     ext4_assert(bd && dev_name);\r
 \r
     for (i = 0; i < CONFIG_EXT4_BLOCKDEVS_COUNT; ++i) {\r
-        if(!_bdevices[i].bd){\r
+        if (!_bdevices[i].bd) {\r
             strcpy(_bdevices[i].name, dev_name);\r
             _bdevices[i].bd = bd;\r
             _bdevices[i].bc = bc;\r
             return EOK;\r
         }\r
 \r
-        if(!strcmp(_bdevices[i].name, dev_name))\r
+        if (!strcmp(_bdevices[i].name, dev_name))\r
             return EOK;\r
     }\r
     return ENOSPC;\r
@@ -120,7 +126,6 @@ int ext4_device_register(struct ext4_blockdev *bd, struct ext4_bcache *bc,
 \r
 /****************************************************************************/\r
 \r
-\r
 static bool ext4_is_dots(const uint8_t *name, size_t name_size)\r
 {\r
     if ((name_size == 1) && (name[0] == '.'))\r
@@ -137,8 +142,7 @@ static int ext4_has_children(bool *has_children, struct ext4_inode_ref *enode)
     struct ext4_fs *fs = enode->fs;\r
 \r
     /* Check if node is directory */\r
-    if (!ext4_inode_is_type(&fs->sb, enode->inode,\r
-            EXT4_INODE_MODE_DIRECTORY)) {\r
+    if (!ext4_inode_is_type(&fs->sb, enode->inode, EXT4_INODE_MODE_DIRECTORY)) {\r
         *has_children = false;\r
         return EOK;\r
     }\r
@@ -153,8 +157,7 @@ static int ext4_has_children(bool *has_children, struct ext4_inode_ref *enode)
     while (it.current != NULL) {\r
         if (it.current->inode != 0) {\r
             uint16_t name_size =\r
-                    ext4_dir_entry_ll_get_name_length(&fs->sb,\r
-                            it.current);\r
+                ext4_dir_entry_ll_get_name_length(&fs->sb, it.current);\r
             if (!ext4_is_dots(it.current->name, name_size)) {\r
                 found = true;\r
                 break;\r
@@ -177,32 +180,29 @@ static int ext4_has_children(bool *has_children, struct ext4_inode_ref *enode)
     return EOK;\r
 }\r
 \r
-\r
 static int ext4_link(struct ext4_mountpoint *mp, struct ext4_inode_ref *parent,\r
-    struct ext4_inode_ref *child, const char *name, uint32_t name_len)\r
+                     struct ext4_inode_ref *child, const char *name,\r
+                     uint32_t name_len)\r
 {\r
     /* Check maximum name length */\r
-    if(name_len > EXT4_DIRECTORY_FILENAME_LEN)\r
+    if (name_len > EXT4_DIRECTORY_FILENAME_LEN)\r
         return EINVAL;\r
 \r
     /* Add entry to parent directory */\r
-    int rc = ext4_dir_add_entry(parent, name, name_len,\r
-            child);\r
+    int rc = ext4_dir_add_entry(parent, name, name_len, child);\r
     if (rc != EOK)\r
         return rc;\r
 \r
     /* Fill new dir -> add '.' and '..' entries */\r
     if (ext4_inode_is_type(&mp->fs.sb, child->inode,\r
-            EXT4_INODE_MODE_DIRECTORY)) {\r
-        rc = ext4_dir_add_entry(child, ".", strlen("."),\r
-                child);\r
+                           EXT4_INODE_MODE_DIRECTORY)) {\r
+        rc = ext4_dir_add_entry(child, ".", strlen("."), child);\r
         if (rc != EOK) {\r
             ext4_dir_remove_entry(parent, name, strlen(name));\r
             return rc;\r
         }\r
 \r
-        rc = ext4_dir_add_entry(child, "..", strlen(".."),\r
-                parent);\r
+        rc = ext4_dir_add_entry(child, "..", strlen(".."), parent);\r
         if (rc != EOK) {\r
             ext4_dir_remove_entry(parent, name, strlen(name));\r
             ext4_dir_remove_entry(child, ".", strlen("."));\r
@@ -215,13 +215,12 @@ static int ext4_link(struct ext4_mountpoint *mp, struct ext4_inode_ref *parent,
 #if CONFIG_DIR_INDEX_ENABLE\r
         /* Initialize directory index if supported */\r
         if (ext4_sb_has_feature_compatible(&mp->fs.sb,\r
-                EXT4_FEATURE_COMPAT_DIR_INDEX)) {\r
+                                           EXT4_FEATURE_COMPAT_DIR_INDEX)) {\r
             rc = ext4_dir_dx_init(child);\r
             if (rc != EOK)\r
                 return rc;\r
 \r
-            ext4_inode_set_flag(child->inode,\r
-                EXT4_INODE_FLAG_INDEX);\r
+            ext4_inode_set_flag(child->inode, EXT4_INODE_FLAG_INDEX);\r
             child->dirty = true;\r
         }\r
 #endif\r
@@ -229,15 +228,15 @@ static int ext4_link(struct ext4_mountpoint *mp, struct ext4_inode_ref *parent,
         ext4_fs_inode_links_count_inc(parent);\r
         child->dirty = true;\r
         parent->dirty = true;\r
-\r
     }\r
 \r
     return EOK;\r
 }\r
 \r
 static int ext4_unlink(struct ext4_mountpoint *mp,\r
-    struct ext4_inode_ref *parent, struct ext4_inode_ref *child_inode_ref,\r
-    const char *name, uint32_t name_len)\r
+                       struct ext4_inode_ref *parent,\r
+                       struct ext4_inode_ref *child_inode_ref, const char *name,\r
+                       uint32_t name_len)\r
 {\r
     bool has_children;\r
     int rc = ext4_has_children(&has_children, child_inode_ref);\r
@@ -254,11 +253,11 @@ static int ext4_unlink(struct ext4_mountpoint *mp,
         return rc;\r
 \r
     bool is_dir = ext4_inode_is_type(&mp->fs.sb, child_inode_ref->inode,\r
-            EXT4_INODE_MODE_DIRECTORY);\r
+                                     EXT4_INODE_MODE_DIRECTORY);\r
 \r
     /* If directory - handle links from parent */\r
     if (is_dir) {\r
-        //ext4_assert(ext4_inode_get_links_count(child_inode_ref->inode) == 1);\r
+        // ext4_assert(ext4_inode_get_links_count(child_inode_ref->inode) == 1);\r
         ext4_fs_inode_links_count_dec(parent);\r
         parent->dirty = true;\r
     }\r
@@ -285,10 +284,9 @@ static int ext4_unlink(struct ext4_mountpoint *mp,
     return EOK;\r
 }\r
 \r
-\r
 /****************************************************************************/\r
 \r
-int ext4_mount(const char * dev_name, char *mount_point)\r
+int ext4_mount(const char *dev_name, char *mount_point)\r
 {\r
     ext4_assert(mount_point && dev_name);\r
     int r = EOK;\r
@@ -299,12 +297,12 @@ int ext4_mount(const char * dev_name, char *mount_point)
     struct ext4_bcache *bc = 0;\r
     struct ext4_mountpoint *mp = 0;\r
 \r
-    if(mount_point[strlen(mount_point) - 1] != '/')\r
+    if (mount_point[strlen(mount_point) - 1] != '/')\r
         return ENOTSUP;\r
 \r
     for (i = 0; i < CONFIG_EXT4_BLOCKDEVS_COUNT; ++i) {\r
-        if(_bdevices[i].name){\r
-            if(!strcmp(dev_name, _bdevices[i].name)){\r
+        if (_bdevices[i].name) {\r
+            if (!strcmp(dev_name, _bdevices[i].name)) {\r
                 bd = _bdevices[i].bd;\r
                 bc = _bdevices[i].bc;\r
                 break;\r
@@ -312,31 +310,31 @@ int ext4_mount(const char * dev_name, char *mount_point)
         }\r
     }\r
 \r
-    if(!bd)\r
+    if (!bd)\r
         return ENODEV;\r
 \r
     for (i = 0; i < CONFIG_EXT4_MOUNTPOINTS_COUNT; ++i) {\r
-        if(!_mp[i].mounted){\r
+        if (!_mp[i].mounted) {\r
             strcpy(_mp[i].name, mount_point);\r
             _mp[i].mounted = 1;\r
             mp = &_mp[i];\r
             break;\r
         }\r
 \r
-        if(!strcmp(_mp[i].name, mount_point)){\r
+        if (!strcmp(_mp[i].name, mount_point)) {\r
             return EOK;\r
         }\r
     }\r
 \r
-    if(!mp)\r
+    if (!mp)\r
         return ENOMEM;\r
 \r
     r = ext4_block_init(bd);\r
-    if(r != EOK)\r
+    if (r != EOK)\r
         return r;\r
 \r
     r = ext4_fs_init(&mp->fs, bd);\r
-    if(r != EOK){\r
+    if (r != EOK) {\r
         ext4_block_fini(bd);\r
         return r;\r
     }\r
@@ -346,27 +344,27 @@ int ext4_mount(const char * dev_name, char *mount_point)
 \r
     mp->cache_dynamic = 0;\r
 \r
-    if(!bc){\r
+    if (!bc) {\r
         /*Automatic block cache alloc.*/\r
         mp->cache_dynamic = 1;\r
         bc = malloc(sizeof(struct ext4_bcache));\r
 \r
         r = ext4_bcache_init_dynamic(bc, CONFIG_BLOCK_DEV_CACHE_SIZE, bsize);\r
-        if(r != EOK){\r
+        if (r != EOK) {\r
             free(bc);\r
             ext4_block_fini(bd);\r
             return r;\r
         }\r
     }\r
 \r
-    if(bsize != bc->itemsize)\r
+    if (bsize != bc->itemsize)\r
         return ENOTSUP;\r
 \r
     /*Bind block cache to block device*/\r
     r = ext4_block_bind_bcache(bd, bc);\r
-    if(r != EOK){\r
+    if (r != EOK) {\r
         ext4_block_fini(bd);\r
-        if(mp->cache_dynamic){\r
+        if (mp->cache_dynamic) {\r
             ext4_bcache_fini_dynamic(bc);\r
             free(bc);\r
         }\r
@@ -376,7 +374,6 @@ int ext4_mount(const char * dev_name, char *mount_point)
     return r;\r
 }\r
 \r
-\r
 int ext4_umount(char *mount_point)\r
 {\r
     int i;\r
@@ -384,22 +381,22 @@ int ext4_umount(char *mount_point)
     struct ext4_mountpoint *mp = 0;\r
 \r
     for (i = 0; i < CONFIG_EXT4_MOUNTPOINTS_COUNT; ++i) {\r
-        if(!strcmp(_mp[i].name, mount_point)){\r
+        if (!strcmp(_mp[i].name, mount_point)) {\r
             mp = &_mp[i];\r
             break;\r
         }\r
     }\r
 \r
-    if(!mp)\r
+    if (!mp)\r
         return ENODEV;\r
 \r
     r = ext4_fs_fini(&mp->fs);\r
-    if(r != EOK)\r
+    if (r != EOK)\r
         return r;\r
 \r
     mp->mounted = 0;\r
 \r
-    if(mp->cache_dynamic){\r
+    if (mp->cache_dynamic) {\r
         ext4_bcache_fini_dynamic(mp->fs.bdev->bc);\r
         free(mp->fs.bdev->bc);\r
     }\r
@@ -408,30 +405,30 @@ int ext4_umount(char *mount_point)
 }\r
 \r
 int ext4_mount_point_stats(const char *mount_point,\r
-    struct ext4_mount_stats *stats)\r
+                           struct ext4_mount_stats *stats)\r
 {\r
     uint32_t i;\r
-    struct ext4_mountpoint    *mp = 0;\r
+    struct ext4_mountpoint *mp = 0;\r
 \r
     for (i = 0; i < CONFIG_EXT4_MOUNTPOINTS_COUNT; ++i) {\r
-        if(!strcmp(_mp[i].name, mount_point)){\r
+        if (!strcmp(_mp[i].name, mount_point)) {\r
             mp = &_mp[i];\r
             break;\r
         }\r
     }\r
-    if(!mp)\r
+    if (!mp)\r
         return ENOENT;\r
 \r
     EXT4_MP_LOCK(mp);\r
-    stats->inodes_count      = ext4_get32(&mp->fs.sb, inodes_count);\r
+    stats->inodes_count = ext4_get32(&mp->fs.sb, inodes_count);\r
     stats->free_inodes_count = ext4_get32(&mp->fs.sb, free_inodes_count);\r
-    stats->blocks_count      = ext4_sb_get_blocks_cnt(&mp->fs.sb);\r
+    stats->blocks_count = ext4_sb_get_blocks_cnt(&mp->fs.sb);\r
     stats->free_blocks_count = ext4_sb_get_free_blocks_cnt(&mp->fs.sb);\r
-    stats->block_size        = ext4_sb_get_block_size(&mp->fs.sb);\r
+    stats->block_size = ext4_sb_get_block_size(&mp->fs.sb);\r
 \r
     stats->block_group_count = ext4_block_group_cnt(&mp->fs.sb);\r
-    stats->blocks_per_group  = ext4_get32(&mp->fs.sb, blocks_per_group);\r
-    stats->inodes_per_group  = ext4_get32(&mp->fs.sb, inodes_per_group);\r
+    stats->blocks_per_group = ext4_get32(&mp->fs.sb, blocks_per_group);\r
+    stats->inodes_per_group = ext4_get32(&mp->fs.sb, inodes_per_group);\r
 \r
     memcpy(stats->volume_name, mp->fs.sb.volume_name, 16);\r
     EXT4_MP_UNLOCK(mp);\r
@@ -439,19 +436,19 @@ int ext4_mount_point_stats(const char *mount_point,
     return EOK;\r
 }\r
 \r
-int ext4_mount_setup_locks(const char * mount_point,\r
-    const struct ext4_lock *locks)\r
+int ext4_mount_setup_locks(const char *mount_point,\r
+                           const struct ext4_lock *locks)\r
 {\r
     uint32_t i;\r
-    struct ext4_mountpoint    *mp = 0;\r
+    struct ext4_mountpoint *mp = 0;\r
 \r
     for (i = 0; i < CONFIG_EXT4_MOUNTPOINTS_COUNT; ++i) {\r
-        if(!strcmp(_mp[i].name, mount_point)){\r
+        if (!strcmp(_mp[i].name, mount_point)) {\r
             mp = &_mp[i];\r
             break;\r
         }\r
     }\r
-    if(!mp)\r
+    if (!mp)\r
         return ENOENT;\r
 \r
     mp->os_locks = locks;\r
@@ -460,32 +457,32 @@ int ext4_mount_setup_locks(const char * mount_point,
 \r
 /********************************FILE OPERATIONS*****************************/\r
 \r
-static struct ext4_mountpoint* ext4_get_mount(const char *path)\r
+static struct ext4_mountpoint *ext4_get_mount(const char *path)\r
 {\r
     int i;\r
     for (i = 0; i < CONFIG_EXT4_MOUNTPOINTS_COUNT; ++i) {\r
 \r
-        if(!_mp[i].mounted)\r
+        if (!_mp[i].mounted)\r
             continue;\r
 \r
-        if(!strncmp(_mp[i].name, path, strlen(_mp[i].name)))\r
+        if (!strncmp(_mp[i].name, path, strlen(_mp[i].name)))\r
             return &_mp[i];\r
     }\r
     return 0;\r
 }\r
 \r
-static int ext4_path_check(const char *path, bool* is_goal)\r
+static int ext4_path_check(const char *path, bool *is_goal)\r
 {\r
     int i;\r
 \r
     for (i = 0; i < EXT4_DIRECTORY_FILENAME_LEN; ++i) {\r
 \r
-        if(path[i] == '/'){\r
+        if (path[i] == '/') {\r
             *is_goal = false;\r
             return i;\r
         }\r
 \r
-        if(path[i] == 0){\r
+        if (path[i] == 0) {\r
             *is_goal = true;\r
             return i;\r
         }\r
@@ -496,35 +493,38 @@ static int ext4_path_check(const char *path, bool* is_goal)
 \r
 static bool ext4_parse_flags(const char *flags, uint32_t *file_flags)\r
 {\r
-    if(!flags)\r
+    if (!flags)\r
         return false;\r
 \r
-    if(!strcmp(flags, "r") || !strcmp(flags, "rb")){\r
+    if (!strcmp(flags, "r") || !strcmp(flags, "rb")) {\r
         *file_flags = O_RDONLY;\r
         return true;\r
     }\r
 \r
-    if(!strcmp(flags, "w") || !strcmp(flags, "wb")){\r
+    if (!strcmp(flags, "w") || !strcmp(flags, "wb")) {\r
         *file_flags = O_WRONLY | O_CREAT | O_TRUNC;\r
         return true;\r
     }\r
 \r
-    if(!strcmp(flags, "a") || !strcmp(flags, "ab")){\r
+    if (!strcmp(flags, "a") || !strcmp(flags, "ab")) {\r
         *file_flags = O_WRONLY | O_CREAT | O_APPEND;\r
         return true;\r
     }\r
 \r
-    if(!strcmp(flags, "r+") || !strcmp(flags, "rb+") || !strcmp(flags, "r+b")){\r
+    if (!strcmp(flags, "r+") || !strcmp(flags, "rb+") ||\r
+        !strcmp(flags, "r+b")) {\r
         *file_flags = O_RDWR;\r
         return true;\r
     }\r
 \r
-    if(!strcmp(flags, "w+") || !strcmp(flags, "wb+") || !strcmp(flags, "w+b")){\r
+    if (!strcmp(flags, "w+") || !strcmp(flags, "wb+") ||\r
+        !strcmp(flags, "w+b")) {\r
         *file_flags = O_RDWR | O_CREAT | O_TRUNC;\r
         return true;\r
     }\r
 \r
-    if(!strcmp(flags, "a+") || !strcmp(flags, "ab+") || !strcmp(flags, "a+b")){\r
+    if (!strcmp(flags, "a+") || !strcmp(flags, "ab+") ||\r
+        !strcmp(flags, "a+b")) {\r
         *file_flags = O_RDWR | O_CREAT | O_APPEND;\r
         return true;\r
     }\r
@@ -534,8 +534,9 @@ static bool ext4_parse_flags(const char *flags, uint32_t *file_flags)
 \r
 /****************************************************************************/\r
 \r
-static int ext4_generic_open (ext4_file *f, const char *path,\r
-    const char *flags, bool file_expect, uint32_t *parent_inode, uint32_t *name_off)\r
+static int ext4_generic_open(ext4_file *f, const char *path, const char *flags,\r
+                             bool file_expect, uint32_t *parent_inode,\r
+                             uint32_t *name_off)\r
 {\r
     struct ext4_mountpoint *mp = ext4_get_mount(path);\r
     struct ext4_directory_search_result result;\r
@@ -547,36 +548,36 @@ static int ext4_generic_open (ext4_file *f, const char *path,
 \r
     f->mp = 0;\r
 \r
-    if(!mp)\r
+    if (!mp)\r
         return ENOENT;\r
 \r
-    if(ext4_parse_flags(flags, &f->flags) == false)\r
+    if (ext4_parse_flags(flags, &f->flags) == false)\r
         return EINVAL;\r
 \r
     /*Skip mount point*/\r
     path += strlen(mp->name);\r
 \r
-    if(name_off)\r
+    if (name_off)\r
         *name_off = strlen(mp->name);\r
 \r
     /*Load root*/\r
     r = ext4_fs_get_inode_ref(&mp->fs, EXT4_INODE_ROOT_INDEX, &ref);\r
 \r
-    if(r != EOK)\r
+    if (r != EOK)\r
         return r;\r
 \r
-    if(parent_inode)\r
+    if (parent_inode)\r
         *parent_inode = ref.index;\r
 \r
     int len = ext4_path_check(path, &is_goal);\r
 \r
-    while(1){\r
+    while (1) {\r
 \r
         len = ext4_path_check(path, &is_goal);\r
 \r
-        if(!len){\r
+        if (!len) {\r
             /*If root open was request.*/\r
-            if(is_goal && !file_expect)\r
+            if (is_goal && !file_expect)\r
                 break;\r
 \r
             r = ENOENT;\r
@@ -584,18 +585,19 @@ static int ext4_generic_open (ext4_file *f, const char *path,
         }\r
 \r
         r = ext4_dir_find_entry(&result, &ref, path, len);\r
-        if(r != EOK){\r
+        if (r != EOK) {\r
 \r
-            if(r != ENOENT)\r
+            if (r != ENOENT)\r
                 break;\r
 \r
-            if(!(f->flags & O_CREAT))\r
+            if (!(f->flags & O_CREAT))\r
                 break;\r
 \r
             /*O_CREAT allows create new entry*/\r
             struct ext4_inode_ref child_ref;\r
-            r = ext4_fs_alloc_inode(&mp->fs, &child_ref, is_goal ? !file_expect : true);\r
-            if(r != EOK)\r
+            r = ext4_fs_alloc_inode(&mp->fs, &child_ref,\r
+                                    is_goal ? !file_expect : true);\r
+            if (r != EOK)\r
                 break;\r
 \r
             /*Destroy last result*/\r
@@ -603,7 +605,7 @@ static int ext4_generic_open (ext4_file *f, const char *path,
 \r
             /*Link with root dir.*/\r
             r = ext4_link(mp, &ref, &child_ref, path, len);\r
-            if(r != EOK){\r
+            if (r != EOK) {\r
                 /*Fali. Free new inode.*/\r
                 ext4_fs_free_inode(&child_ref);\r
                 /*We do not want to write new inode.\r
@@ -618,59 +620,60 @@ static int ext4_generic_open (ext4_file *f, const char *path,
             continue;\r
         }\r
 \r
-        if(parent_inode)\r
+        if (parent_inode)\r
             *parent_inode = ref.index;\r
 \r
         next_inode = result.dentry->inode;\r
-        inode_type = ext4_dir_entry_ll_get_inode_type(&mp->fs.sb, result.dentry);\r
+        inode_type =\r
+            ext4_dir_entry_ll_get_inode_type(&mp->fs.sb, result.dentry);\r
 \r
         r = ext4_dir_destroy_result(&ref, &result);\r
-        if(r != EOK)\r
+        if (r != EOK)\r
             break;\r
 \r
         /*If expected file error*/\r
-        if((inode_type == EXT4_DIRECTORY_FILETYPE_REG_FILE)\r
-                && !file_expect && is_goal){\r
+        if ((inode_type == EXT4_DIRECTORY_FILETYPE_REG_FILE) && !file_expect &&\r
+            is_goal) {\r
             r = ENOENT;\r
             break;\r
         }\r
 \r
         /*If expected directory error*/\r
-        if((inode_type == EXT4_DIRECTORY_FILETYPE_DIR)\r
-                && file_expect && is_goal){\r
+        if ((inode_type == EXT4_DIRECTORY_FILETYPE_DIR) && file_expect &&\r
+            is_goal) {\r
             r = ENOENT;\r
             break;\r
         }\r
 \r
         r = ext4_fs_put_inode_ref(&ref);\r
-        if(r != EOK)\r
+        if (r != EOK)\r
             break;\r
 \r
         r = ext4_fs_get_inode_ref(&mp->fs, next_inode, &ref);\r
-        if(r != EOK)\r
+        if (r != EOK)\r
             break;\r
 \r
-        if(is_goal)\r
+        if (is_goal)\r
             break;\r
 \r
         path += len + 1;\r
 \r
-        if(name_off)\r
+        if (name_off)\r
             *name_off += len + 1;\r
     };\r
 \r
-    if(r != EOK){\r
+    if (r != EOK) {\r
         ext4_fs_put_inode_ref(&ref);\r
         return r;\r
     }\r
 \r
-    if(is_goal){\r
+    if (is_goal) {\r
 \r
-        if((f->flags & O_TRUNC) &&\r
-                (inode_type == EXT4_DIRECTORY_FILETYPE_REG_FILE)){\r
+        if ((f->flags & O_TRUNC) &&\r
+            (inode_type == EXT4_DIRECTORY_FILETYPE_REG_FILE)) {\r
 \r
             r = ext4_fs_truncate_inode(&ref, 0);\r
-            if(r != EOK){\r
+            if (r != EOK) {\r
                 ext4_fs_put_inode_ref(&ref);\r
                 return r;\r
             }\r
@@ -679,9 +682,9 @@ static int ext4_generic_open (ext4_file *f, const char *path,
         f->mp = mp;\r
         f->fsize = ext4_inode_get_size(&f->mp->fs.sb, ref.inode);\r
         f->inode = ref.index;\r
-        f->fpos  = 0;\r
+        f->fpos = 0;\r
 \r
-        if(f->flags & O_APPEND)\r
+        if (f->flags & O_APPEND)\r
             f->fpos = f->fsize;\r
     }\r
 \r
@@ -695,7 +698,7 @@ int ext4_cache_write_back(const char *path, bool on)
 {\r
     struct ext4_mountpoint *mp = ext4_get_mount(path);\r
 \r
-    if(!mp)\r
+    if (!mp)\r
         return ENOENT;\r
 \r
     EXT4_MP_LOCK(mp);\r
@@ -704,10 +707,9 @@ int ext4_cache_write_back(const char *path, bool on)
     return EOK;\r
 }\r
 \r
-\r
 int ext4_fremove(const char *path)\r
 {\r
-    ext4_file   f;\r
+    ext4_file f;\r
     uint32_t parent_inode;\r
     uint32_t name_off;\r
     int r;\r
@@ -718,26 +720,26 @@ int ext4_fremove(const char *path)
     struct ext4_inode_ref child;\r
     struct ext4_inode_ref parent;\r
 \r
-    if(!mp)\r
+    if (!mp)\r
         return ENOENT;\r
 \r
     EXT4_MP_LOCK(mp);\r
     r = ext4_generic_open(&f, path, "r", true, &parent_inode, &name_off);\r
-    if(r != EOK){\r
+    if (r != EOK) {\r
         EXT4_MP_UNLOCK(mp);\r
         return r;\r
     }\r
 \r
     /*Load parent*/\r
     r = ext4_fs_get_inode_ref(&mp->fs, parent_inode, &parent);\r
-    if(r != EOK){\r
+    if (r != EOK) {\r
         EXT4_MP_UNLOCK(mp);\r
         return r;\r
     }\r
 \r
     /*We have file to delete. Load it.*/\r
     r = ext4_fs_get_inode_ref(&mp->fs, f.inode, &child);\r
-    if(r != EOK){\r
+    if (r != EOK) {\r
         ext4_fs_put_inode_ref(&parent);\r
         EXT4_MP_UNLOCK(mp);\r
         return r;\r
@@ -749,7 +751,7 @@ int ext4_fremove(const char *path)
     r = ext4_fs_truncate_inode(&child, 0);\r
     ext4_block_cache_write_back(mp->fs.bdev, 0);\r
 \r
-    if(r != EOK)\r
+    if (r != EOK)\r
         goto Finish;\r
 \r
     /*Set path*/\r
@@ -759,26 +761,26 @@ int ext4_fremove(const char *path)
 \r
     /*Unlink from parent.*/\r
     r = ext4_unlink(mp, &parent, &child, path, len);\r
-    if(r != EOK)\r
+    if (r != EOK)\r
         goto Finish;\r
 \r
     r = ext4_fs_free_inode(&child);\r
-    if(r != EOK)\r
+    if (r != EOK)\r
         goto Finish;\r
 \r
-    Finish:\r
+Finish:\r
     ext4_fs_put_inode_ref(&child);\r
     ext4_fs_put_inode_ref(&parent);\r
     EXT4_MP_UNLOCK(mp);\r
     return r;\r
 }\r
 \r
-int ext4_fopen (ext4_file *f, const char *path, const char *flags)\r
+int ext4_fopen(ext4_file *f, const char *path, const char *flags)\r
 {\r
     struct ext4_mountpoint *mp = ext4_get_mount(path);\r
     int r;\r
 \r
-    if(!mp)\r
+    if (!mp)\r
         return ENOENT;\r
 \r
     EXT4_MP_LOCK(mp);\r
@@ -793,10 +795,10 @@ int ext4_fclose(ext4_file *f)
 {\r
     ext4_assert(f && f->mp);\r
 \r
-    f->mp    = 0;\r
+    f->mp = 0;\r
     f->flags = 0;\r
     f->inode = 0;\r
-    f->fpos  = f->fsize = 0;\r
+    f->fpos = f->fsize = 0;\r
 \r
     return EOK;\r
 }\r
@@ -816,19 +818,19 @@ int ext4_fread(ext4_file *f, void *buf, uint32_t size, uint32_t *rcnt)
 \r
     ext4_assert(f && f->mp);\r
 \r
-    if(f->flags & O_WRONLY)\r
+    if (f->flags & O_WRONLY)\r
         return EPERM;\r
 \r
-    if(!size)\r
+    if (!size)\r
         return EOK;\r
 \r
     EXT4_MP_LOCK(f->mp);\r
 \r
-    if(rcnt)\r
+    if (rcnt)\r
         *rcnt = 0;\r
 \r
     r = ext4_fs_get_inode_ref(&f->mp->fs, f->inode, &ref);\r
-    if(r != EOK){\r
+    if (r != EOK) {\r
         EXT4_MP_UNLOCK(f->mp);\r
         return r;\r
     }\r
@@ -836,37 +838,35 @@ int ext4_fread(ext4_file *f, void *buf, uint32_t size, uint32_t *rcnt)
     /*Sync file size*/\r
     f->fsize = ext4_inode_get_size(&f->mp->fs.sb, ref.inode);\r
 \r
-\r
     block_size = ext4_sb_get_block_size(&f->mp->fs.sb);\r
     size = size > (f->fsize - f->fpos) ? (f->fsize - f->fpos) : size;\r
     sblock = (f->fpos) / block_size;\r
     sblock_end = (f->fpos + size) / block_size;\r
     u = (f->fpos) % block_size;\r
 \r
-\r
-    if(u){\r
+    if (u) {\r
 \r
         uint32_t ll = size > (block_size - u) ? (block_size - u) : size;\r
 \r
         r = ext4_fs_get_inode_data_block_index(&ref, sblock, &fblock);\r
-        if(r != EOK)\r
+        if (r != EOK)\r
             goto Finish;\r
 \r
         r = ext4_block_get(f->mp->fs.bdev, &b, fblock);\r
-        if(r != EOK)\r
+        if (r != EOK)\r
             goto Finish;\r
 \r
         memcpy(u8_buf, b.data + u, ll);\r
 \r
         r = ext4_block_set(f->mp->fs.bdev, &b);\r
-        if(r != EOK)\r
+        if (r != EOK)\r
             goto Finish;\r
 \r
-        u8_buf  += ll;\r
-        size    -= ll;\r
+        u8_buf += ll;\r
+        size -= ll;\r
         f->fpos += ll;\r
 \r
-        if(rcnt)\r
+        if (rcnt)\r
             *rcnt += ll;\r
 \r
         sblock++;\r
@@ -874,61 +874,62 @@ int ext4_fread(ext4_file *f, void *buf, uint32_t size, uint32_t *rcnt)
 \r
     fblock_start = 0;\r
     fblock_cnt = 0;\r
-    while(size >= block_size){\r
-        while(sblock < sblock_end){\r
+    while (size >= block_size) {\r
+        while (sblock < sblock_end) {\r
             r = ext4_fs_get_inode_data_block_index(&ref, sblock, &fblock);\r
-            if(r != EOK)\r
+            if (r != EOK)\r
                 goto Finish;\r
 \r
             sblock++;\r
 \r
-            if(!fblock_start){\r
+            if (!fblock_start) {\r
                 fblock_start = fblock;\r
             }\r
 \r
-            if((fblock_start + fblock_cnt) != fblock)\r
+            if ((fblock_start + fblock_cnt) != fblock)\r
                 break;\r
 \r
             fblock_cnt++;\r
         }\r
 \r
-        r = ext4_blocks_get_direct(f->mp->fs.bdev, u8_buf, fblock_start, fblock_cnt);\r
-        if(r != EOK)\r
+        r = ext4_blocks_get_direct(f->mp->fs.bdev, u8_buf, fblock_start,\r
+                                   fblock_cnt);\r
+        if (r != EOK)\r
             goto Finish;\r
 \r
-        size    -= block_size * fblock_cnt;\r
-        u8_buf  += block_size * fblock_cnt;\r
+        size -= block_size * fblock_cnt;\r
+        u8_buf += block_size * fblock_cnt;\r
         f->fpos += block_size * fblock_cnt;\r
 \r
-        if(rcnt)\r
+        if (rcnt)\r
             *rcnt += block_size * fblock_cnt;\r
 \r
         fblock_start = fblock;\r
         fblock_cnt = 1;\r
     }\r
 \r
-    if(size){\r
+    if (size) {\r
         r = ext4_fs_get_inode_data_block_index(&ref, sblock, &fblock);\r
-        if(r != EOK)\r
+        if (r != EOK)\r
             goto Finish;\r
 \r
         r = ext4_block_get(f->mp->fs.bdev, &b, fblock);\r
-        if(r != EOK)\r
+        if (r != EOK)\r
             goto Finish;\r
 \r
-        memcpy(u8_buf, b.data , size);\r
+        memcpy(u8_buf, b.data, size);\r
 \r
         r = ext4_block_set(f->mp->fs.bdev, &b);\r
-        if(r != EOK)\r
+        if (r != EOK)\r
             goto Finish;\r
 \r
         f->fpos += size;\r
 \r
-        if(rcnt)\r
+        if (rcnt)\r
             *rcnt += size;\r
     }\r
 \r
-    Finish:\r
+Finish:\r
     ext4_fs_put_inode_ref(&ref);\r
     EXT4_MP_UNLOCK(f->mp);\r
     return r;\r
@@ -949,23 +950,24 @@ int ext4_fwrite(ext4_file *f, const void *buf, uint32_t size, uint32_t *wcnt)
     struct ext4_block b;\r
     struct ext4_inode_ref ref;\r
     const uint8_t *u8_buf = buf;\r
-    int r;;\r
+    int r;\r
+    ;\r
 \r
     ext4_assert(f && f->mp);\r
 \r
-    if(f->flags & O_RDONLY)\r
+    if (f->flags & O_RDONLY)\r
         return EPERM;\r
 \r
-    if(!size)\r
+    if (!size)\r
         return EOK;\r
 \r
     EXT4_MP_LOCK(f->mp);\r
 \r
-    if(wcnt)\r
+    if (wcnt)\r
         *wcnt = 0;\r
 \r
     r = ext4_fs_get_inode_ref(&f->mp->fs, f->inode, &ref);\r
-    if(r != EOK){\r
+    if (r != EOK) {\r
         EXT4_MP_UNLOCK(f->mp);\r
         return r;\r
     }\r
@@ -979,85 +981,83 @@ int ext4_fwrite(ext4_file *f, const void *buf, uint32_t size, uint32_t *wcnt)
     sblock_end /= block_size;\r
     file_blocks = (f->fsize / block_size);\r
 \r
-    if(f->fsize % block_size)\r
+    if (f->fsize % block_size)\r
         file_blocks++;\r
 \r
     sblock = (f->fpos) / block_size;\r
 \r
     u = (f->fpos) % block_size;\r
 \r
-\r
-    if(u){\r
+    if (u) {\r
         uint32_t ll = size > (block_size - u) ? (block_size - u) : size;\r
 \r
         r = ext4_fs_get_inode_data_block_index(&ref, sblock, &fblock);\r
-        if(r != EOK)\r
+        if (r != EOK)\r
             goto Finish;\r
 \r
         r = ext4_block_get(f->mp->fs.bdev, &b, fblock);\r
-        if(r != EOK)\r
+        if (r != EOK)\r
             goto Finish;\r
 \r
         memcpy(b.data + u, u8_buf, ll);\r
         b.dirty = true;\r
 \r
         r = ext4_block_set(f->mp->fs.bdev, &b);\r
-        if(r != EOK)\r
+        if (r != EOK)\r
             goto Finish;\r
 \r
-        u8_buf  += ll;\r
-        size    -= ll;\r
+        u8_buf += ll;\r
+        size -= ll;\r
         f->fpos += ll;\r
 \r
-        if(wcnt)\r
+        if (wcnt)\r
             *wcnt += ll;\r
 \r
         sblock++;\r
     }\r
 \r
-\r
     /*Start write back cache mode.*/\r
     r = ext4_block_cache_write_back(f->mp->fs.bdev, 1);\r
-    if(r != EOK)\r
+    if (r != EOK)\r
         goto Finish;\r
 \r
     fblock_start = 0;\r
     fblock_cnt = 0;\r
-    while(size >= block_size){\r
+    while (size >= block_size) {\r
 \r
-        while(sblock < sblock_end){\r
-            if(sblock < file_blocks){\r
+        while (sblock < sblock_end) {\r
+            if (sblock < file_blocks) {\r
                 r = ext4_fs_get_inode_data_block_index(&ref, sblock, &fblock);\r
-                if(r != EOK)\r
+                if (r != EOK)\r
                     break;\r
-            }\r
-            else {\r
+            } else {\r
                 r = ext4_fs_append_inode_block(&ref, &fblock, &sblock);\r
-                if(r != EOK)\r
+                if (r != EOK)\r
                     break;\r
             }\r
 \r
             sblock++;\r
 \r
-            if(!fblock_start){\r
+            if (!fblock_start) {\r
                 fblock_start = fblock;\r
             }\r
 \r
-            if((fblock_start + fblock_cnt) != fblock)\r
+            if ((fblock_start + fblock_cnt) != fblock)\r
                 break;\r
 \r
             fblock_cnt++;\r
         }\r
 \r
-        r = ext4_blocks_set_direct(f->mp->fs.bdev, u8_buf, fblock_start, fblock_cnt);\r
-        if(r != EOK)\r
+        r = ext4_blocks_set_direct(f->mp->fs.bdev, u8_buf, fblock_start,\r
+                                   fblock_cnt);\r
+        if (r != EOK)\r
             break;\r
 \r
-        size    -= block_size * fblock_cnt;\r
-        u8_buf  += block_size * fblock_cnt;\r
+        size -= block_size * fblock_cnt;\r
+        u8_buf += block_size * fblock_cnt;\r
         f->fpos += block_size * fblock_cnt;\r
 \r
-        if(wcnt)\r
+        if (wcnt)\r
             *wcnt += block_size * fblock_cnt;\r
 \r
         fblock_start = fblock;\r
@@ -1067,86 +1067,77 @@ int ext4_fwrite(ext4_file *f, const void *buf, uint32_t size, uint32_t *wcnt)
     /*Stop write back cache mode*/\r
     ext4_block_cache_write_back(f->mp->fs.bdev, 0);\r
 \r
-    if(r != EOK)\r
+    if (r != EOK)\r
         goto Finish;\r
 \r
-    if(size){\r
-        if(sblock < file_blocks){\r
+    if (size) {\r
+        if (sblock < file_blocks) {\r
             r = ext4_fs_get_inode_data_block_index(&ref, sblock, &fblock);\r
-            if(r != EOK)\r
+            if (r != EOK)\r
                 goto Finish;\r
-        }\r
-        else {\r
+        } else {\r
             r = ext4_fs_append_inode_block(&ref, &fblock, &sblock);\r
-            if(r != EOK)\r
+            if (r != EOK)\r
                 goto Finish;\r
         }\r
 \r
         r = ext4_block_get(f->mp->fs.bdev, &b, fblock);\r
-        if(r != EOK)\r
+        if (r != EOK)\r
             goto Finish;\r
 \r
-        memcpy(b.data, u8_buf , size);\r
+        memcpy(b.data, u8_buf, size);\r
         b.dirty = true;\r
 \r
         r = ext4_block_set(f->mp->fs.bdev, &b);\r
-        if(r != EOK)\r
+        if (r != EOK)\r
             goto Finish;\r
 \r
         f->fpos += size;\r
 \r
-        if(wcnt)\r
+        if (wcnt)\r
             *wcnt += size;\r
     }\r
 \r
-    if(f->fpos > f->fsize){\r
+    if (f->fpos > f->fsize) {\r
         f->fsize = f->fpos;\r
         ext4_inode_set_size(ref.inode, f->fsize);\r
         ref.dirty = true;\r
     }\r
 \r
-    Finish:\r
+Finish:\r
     ext4_fs_put_inode_ref(&ref);\r
     EXT4_MP_UNLOCK(f->mp);\r
     return r;\r
-\r
 }\r
 \r
 int ext4_fseek(ext4_file *f, uint64_t offset, uint32_t origin)\r
 {\r
-    switch(origin){\r
+    switch (origin) {\r
     case SEEK_SET:\r
-        if(offset > f->fsize)\r
+        if (offset > f->fsize)\r
             return EINVAL;\r
 \r
         f->fpos = offset;\r
         return EOK;\r
     case SEEK_CUR:\r
-        if((offset + f->fpos) > f->fsize)\r
+        if ((offset + f->fpos) > f->fsize)\r
             return EINVAL;\r
 \r
         f->fpos += offset;\r
         return EOK;\r
     case SEEK_END:\r
-        if(offset > f->fsize)\r
+        if (offset > f->fsize)\r
             return EINVAL;\r
 \r
         f->fpos = f->fsize - offset;\r
         return EOK;\r
-\r
     }\r
     return EINVAL;\r
 }\r
 \r
-uint64_t ext4_ftell (ext4_file *f)\r
-{\r
-    return f->fpos;\r
-}\r
+uint64_t ext4_ftell(ext4_file *f) { return f->fpos; }\r
 \r
-uint64_t ext4_fsize (ext4_file *f)\r
-{\r
-    return f->fsize;\r
-}\r
+uint64_t ext4_fsize(ext4_file *f) { return f->fsize; }\r
 \r
 /*********************************DIRECTORY OPERATION************************/\r
 \r
@@ -1170,14 +1161,14 @@ int ext4_dir_rm(const char *path)
     bool is_goal;\r
     bool dir_end;\r
 \r
-    if(!mp)\r
+    if (!mp)\r
         return ENOENT;\r
 \r
     EXT4_MP_LOCK(mp);\r
 \r
     /*Check if exist.*/\r
     r = ext4_generic_open(&f, path, "r", false, &inode_up, &name_off);\r
-    if(r != EOK){\r
+    if (r != EOK) {\r
         EXT4_MP_UNLOCK(mp);\r
         return r;\r
     }\r
@@ -1193,46 +1184,46 @@ int ext4_dir_rm(const char *path)
     do {\r
         /*Load directory node.*/\r
         r = ext4_fs_get_inode_ref(&f.mp->fs, inode_current, &current);\r
-        if(r != EOK){\r
+        if (r != EOK) {\r
             break;\r
         }\r
 \r
         /*Initialize iterator.*/\r
         r = ext4_dir_iterator_init(&it, &current, 0);\r
-        if(r != EOK){\r
+        if (r != EOK) {\r
             ext4_fs_put_inode_ref(&current);\r
             break;\r
         }\r
 \r
-        while(r == EOK){\r
+        while (r == EOK) {\r
 \r
-            if(!it.current){\r
+            if (!it.current) {\r
                 dir_end = true;\r
                 break;\r
             }\r
 \r
             /*Get up directory inode when ".." entry*/\r
-            if((it.current->name_length == 2) &&\r
-                    ext4_is_dots(it.current->name, it.current->name_length)){\r
+            if ((it.current->name_length == 2) &&\r
+                ext4_is_dots(it.current->name, it.current->name_length)) {\r
                 inode_up = it.current->inode;\r
             }\r
 \r
             /*If directory or file entry,  but not "." ".." entry*/\r
-            if(!ext4_is_dots(it.current->name, it.current->name_length)){\r
+            if (!ext4_is_dots(it.current->name, it.current->name_length)) {\r
 \r
                 /*Get child inode reference do unlink directory/file.*/\r
                 r = ext4_fs_get_inode_ref(&f.mp->fs, it.current->inode, &child);\r
-                if(r != EOK)\r
+                if (r != EOK)\r
                     break;\r
 \r
                 /*If directory with no leaf children*/\r
                 r = ext4_has_children(&has_children, &child);\r
-                if(r != EOK){\r
+                if (r != EOK) {\r
                     ext4_fs_put_inode_ref(&child);\r
                     break;\r
                 }\r
 \r
-                if(has_children){\r
+                if (has_children) {\r
                     /*Has directory children. Go into this tirectory.*/\r
                     inode_up = inode_current;\r
                     inode_current = it.current->inode;\r
@@ -1243,51 +1234,52 @@ int ext4_dir_rm(const char *path)
 \r
                 /*Directory is empty. Truncate it.*/\r
                 r = ext4_fs_truncate_inode(&child, 0);\r
-                if(r != EOK){\r
+                if (r != EOK) {\r
                     ext4_fs_put_inode_ref(&child);\r
                     break;\r
                 }\r
 \r
                 /*No children in child directory or file. Just unlink.*/\r
                 r = ext4_unlink(f.mp, &current, &child,\r
-                        (char *)it.current->name, it.current->name_length);\r
-                if(r != EOK){\r
+                                (char *)it.current->name,\r
+                                it.current->name_length);\r
+                if (r != EOK) {\r
                     ext4_fs_put_inode_ref(&child);\r
                     break;\r
                 }\r
 \r
                 r = ext4_fs_free_inode(&child);\r
-                if(r != EOK){\r
+                if (r != EOK) {\r
                     ext4_fs_put_inode_ref(&child);\r
                     break;\r
                 }\r
 \r
                 r = ext4_fs_put_inode_ref(&child);\r
-                if(r != EOK)\r
+                if (r != EOK)\r
                     break;\r
             }\r
 \r
             r = ext4_dir_iterator_next(&it);\r
         }\r
 \r
-        if(dir_end){\r
+        if (dir_end) {\r
             /*Directory iterator reached last entry*/\r
             ext4_has_children(&has_children, &current);\r
-            if(!has_children){\r
+            if (!has_children) {\r
                 inode_current = inode_up;\r
-                if(depth)\r
+                if (depth)\r
                     depth--;\r
             }\r
             /*Last unlink*/\r
-            if(!depth){\r
+            if (!depth) {\r
                 /*Load parent.*/\r
                 struct ext4_inode_ref parent;\r
                 r = ext4_fs_get_inode_ref(&f.mp->fs, inode_up, &parent);\r
-                if(r != EOK)\r
+                if (r != EOK)\r
                     goto End;\r
 \r
                 r = ext4_fs_truncate_inode(&current, 0);\r
-                if(r != EOK){\r
+                if (r != EOK) {\r
                     ext4_fs_put_inode_ref(&parent);\r
                     goto End;\r
                 }\r
@@ -1295,33 +1287,33 @@ int ext4_dir_rm(const char *path)
                 /* In this place all directories should be unlinked.\r
                  * Last unlink from root of current directory*/\r
                 r = ext4_unlink(f.mp, &parent, &current, (char *)path, len);\r
-                if(r != EOK){\r
+                if (r != EOK) {\r
                     ext4_fs_put_inode_ref(&parent);\r
                     goto End;\r
                 }\r
 \r
                 r = ext4_fs_free_inode(&current);\r
-                if(r != EOK){\r
+                if (r != EOK) {\r
                     ext4_fs_put_inode_ref(&parent);\r
                     goto End;\r
                 }\r
 \r
                 r = ext4_fs_put_inode_ref(&parent);\r
-                if(r != EOK)\r
+                if (r != EOK)\r
                     goto End;\r
             }\r
         }\r
 \r
-        End:\r
+    End:\r
         ext4_dir_iterator_fini(&it);\r
         ext4_fs_put_inode_ref(&current);\r
         dir_end = false;\r
 \r
         /*When something goes wrong. End loop.*/\r
-        if(r != EOK)\r
+        if (r != EOK)\r
             break;\r
 \r
-    }while(depth);\r
+    } while (depth);\r
 \r
     ext4_block_cache_write_back(mp->fs.bdev, 0);\r
     EXT4_MP_UNLOCK(mp);\r
@@ -1335,14 +1327,14 @@ int ext4_dir_mk(const char *path)
 \r
     struct ext4_mountpoint *mp = ext4_get_mount(path);\r
 \r
-    if(!mp)\r
+    if (!mp)\r
         return ENOENT;\r
 \r
     EXT4_MP_LOCK(mp);\r
 \r
     /*Check if exist.*/\r
     r = ext4_generic_open(&f, path, "r", false, 0, 0);\r
-    if(r == EOK){\r
+    if (r == EOK) {\r
         /*Directory already created*/\r
         EXT4_MP_UNLOCK(mp);\r
         return r;\r
@@ -1350,7 +1342,7 @@ int ext4_dir_mk(const char *path)
 \r
     /*Create new dir*/\r
     r = ext4_generic_open(&f, path, "w", false, 0, 0);\r
-    if(r != EOK){\r
+    if (r != EOK) {\r
         EXT4_MP_UNLOCK(mp);\r
         return r;\r
     }\r
@@ -1359,12 +1351,12 @@ int ext4_dir_mk(const char *path)
     return r;\r
 }\r
 \r
-int ext4_dir_open (ext4_dir *d, const char *path)\r
+int ext4_dir_open(ext4_dir *d, const char *path)\r
 {\r
     struct ext4_mountpoint *mp = ext4_get_mount(path);\r
     int r;\r
 \r
-    if(!mp)\r
+    if (!mp)\r
         return ENOENT;\r
 \r
     EXT4_MP_LOCK(mp);\r
@@ -1374,12 +1366,9 @@ int ext4_dir_open (ext4_dir *d, const char *path)
     return r;\r
 }\r
 \r
-int ext4_dir_close(ext4_dir *d)\r
-{\r
-    return ext4_fclose(&d->f);\r
-}\r
+int ext4_dir_close(ext4_dir *d) { return ext4_fclose(&d->f); }\r
 \r
-ext4_direntry* ext4_dir_entry_next(ext4_dir *d)\r
+ext4_direntry *ext4_dir_entry_next(ext4_dir *d)\r
 {\r
 #define EXT4_DIR_ENTRY_OFFSET_TERM (uint64_t)(-1)\r
 \r
@@ -1390,16 +1379,16 @@ ext4_direntry* ext4_dir_entry_next(ext4_dir *d)
 \r
     EXT4_MP_LOCK(d->f.mp);\r
 \r
-    if(d->next_off == EXT4_DIR_ENTRY_OFFSET_TERM)\r
+    if (d->next_off == EXT4_DIR_ENTRY_OFFSET_TERM)\r
         return 0;\r
 \r
     r = ext4_fs_get_inode_ref(&d->f.mp->fs, d->f.inode, &dir);\r
-    if(r != EOK){\r
+    if (r != EOK) {\r
         goto Finish;\r
     }\r
 \r
     r = ext4_dir_iterator_init(&it, &dir, d->next_off);\r
-    if(r != EOK){\r
+    if (r != EOK) {\r
         ext4_fs_put_inode_ref(&dir);\r
         goto Finish;\r
     }\r
@@ -1414,7 +1403,7 @@ ext4_direntry* ext4_dir_entry_next(ext4_dir *d)
     ext4_dir_iterator_fini(&it);\r
     ext4_fs_put_inode_ref(&dir);\r
 \r
-    Finish:\r
+Finish:\r
     EXT4_MP_UNLOCK(d->f.mp);\r
     return de;\r
 }\r

diff --git a/lwext4/ext4.h b/lwext4/ext4.h
index f17745763a1b04d2dc07c1d68affcf1bd043a801..3f7cf4453fe1e422a80cfad32a02810526b3c3e8 100644 (file)
--- a/lwext4/ext4.h
+++ b/lwext4/ext4.h
@@ -45,51 +45,52 @@
 /********************************FILE OPEN FLAGS*****************************/\r
 \r
 #ifndef O_RDONLY\r
-#define O_RDONLY    00\r
+#define O_RDONLY 00\r
 #endif\r
 \r
 #ifndef O_WRONLY\r
-#define O_WRONLY    01\r
+#define O_WRONLY 01\r
 #endif\r
 \r
 #ifndef O_RDWR\r
-#define O_RDWR      02\r
+#define O_RDWR 02\r
 #endif\r
 \r
 #ifndef O_CREAT\r
-#define O_CREAT     0100\r
+#define O_CREAT 0100\r
 #endif\r
 \r
 #ifndef O_EXCL\r
-#define O_EXCL      0200\r
+#define O_EXCL 0200\r
 #endif\r
 \r
 #ifndef O_TRUNC\r
-#define O_TRUNC     01000\r
+#define O_TRUNC 01000\r
 #endif\r
 \r
 #ifndef O_APPEND\r
-#define O_APPEND    02000\r
+#define O_APPEND 02000\r
 #endif\r
 \r
 /********************************FILE SEEK FLAGS*****************************/\r
 \r
 #ifndef SEEK_SET\r
-#define SEEK_SET    0\r
+#define SEEK_SET 0\r
 #endif\r
 \r
 #ifndef SEEK_CUR\r
-#define SEEK_CUR    1\r
+#define SEEK_CUR 1\r
 #endif\r
 \r
 #ifndef SEEK_END\r
-#define SEEK_END    2\r
+#define SEEK_END 2\r
 #endif\r
 \r
 /********************************OS LOCK INFERFACE***************************/\r
 \r
 /**@brief   OS dependent lock interface.*/\r
-struct ext4_lock {\r
+struct ext4_lock\r
+{\r
 \r
     /**@brief   Lock access to mount point*/\r
     void (*lock)(void);\r
@@ -98,11 +99,11 @@ struct ext4_lock {
     void (*unlock)(void);\r
 };\r
 \r
-\r
 /********************************FILE DESCRIPTOR*****************************/\r
 \r
 /**@brief   File descriptor*/\r
-typedef struct ext4_file {\r
+typedef struct ext4_file\r
+{\r
 \r
     /**@brief   Mount point handle.*/\r
     struct ext4_mountpoint *mp;\r
@@ -118,11 +119,11 @@ typedef struct ext4_file {
 \r
     /**@brief   File position*/\r
     uint64_t fpos;\r
-}ext4_file;\r
+} ext4_file;\r
 \r
 /*****************************DIRECTORY DESCRIPTOR***************************/\r
 /**@brief   Directory entry types. Copy from ext4_types.h*/\r
-enum  {\r
+enum {\r
     EXT4_DIRENTRY_UNKNOWN = 0,\r
     EXT4_DIRENTRY_REG_FILE,\r
     EXT4_DIRENTRY_DIR,\r
@@ -134,22 +135,24 @@ enum  {
 };\r
 \r
 /**@brief   Directory entry descriptor. Copy from ext4_types.h*/\r
-typedef struct {\r
+typedef struct\r
+{\r
     uint32_t inode;\r
     uint16_t entry_length;\r
     uint8_t name_length;\r
     uint8_t inode_type;\r
     uint8_t name[255];\r
-}ext4_direntry;\r
+} ext4_direntry;\r
 \r
-typedef struct  {\r
+typedef struct\r
+{\r
     /**@brief   File descriptor*/\r
     ext4_file f;\r
     /**@brief   Current directory entry.*/\r
     ext4_direntry de;\r
     /**@brief   Next entry offset*/\r
     uint64_t next_off;\r
-}ext4_dir;\r
+} ext4_dir;\r
 \r
 /********************************MOUNT OPERATIONS****************************/\r
 \r
@@ -163,7 +166,7 @@ typedef struct  {
  * @param   dev_name register name\r
  * @param   standard error code*/\r
 int ext4_device_register(struct ext4_blockdev *bd, struct ext4_bcache *bc,\r
-        const char *dev_name);\r
+                         const char *dev_name);\r
 \r
 /**@brief   Mount a block device with EXT4 partition to the mount point.\r
  * @param   dev_name block device name (@ref ext4_device_register)\r
@@ -173,16 +176,16 @@ int ext4_device_register(struct ext4_blockdev *bd, struct ext4_bcache *bc,
  *          -   /my_second_partition/\r
  *\r
  * @return standard error code */\r
-int ext4_mount(const char * dev_name,  char *mount_point);\r
+int ext4_mount(const char *dev_name, char *mount_point);\r
 \r
 /**@brief   Umount operation.\r
  * @param   mount_point mount name\r
  * @return  standard error code */\r
 int ext4_umount(char *mount_point);\r
 \r
-\r
 /**@brief   Some of the filesystem stats.*/\r
-struct ext4_mount_stats {\r
+struct ext4_mount_stats\r
+{\r
     uint32_t inodes_count;\r
     uint32_t free_inodes_count;\r
     uint64_t blocks_count;\r
@@ -201,14 +204,14 @@ struct ext4_mount_stats {
  * @param   stats ext fs stats\r
  * @return  standard error code */\r
 int ext4_mount_point_stats(const char *mount_point,\r
-    struct ext4_mount_stats *stats);\r
+                           struct ext4_mount_stats *stats);\r
 \r
 /**@brief   Setup OS lock routines.\r
  * @param   mount_point mount path\r
  * @param   locks - lock and unlock functions\r
  * @return  standard error code */\r
-int ext4_mount_setup_locks(const char * mount_point,\r
-    const struct ext4_lock *locks);\r
+int ext4_mount_setup_locks(const char *mount_point,\r
+                           const struct ext4_lock *locks);\r
 \r
 /**@brief   Enable/disable write back cache mode.\r
  * @warning Default model of cache is write trough. It means that when You do:\r
@@ -273,7 +276,7 @@ int ext4_fremove(const char *path);
  *  |---------------------------------------------------------------|\r
  *\r
  * @return  standard error code*/\r
-int ext4_fopen (ext4_file *f, const char *path, const char *flags);\r
+int ext4_fopen(ext4_file *f, const char *path, const char *flags);\r
 \r
 /**@brief   File close function.\r
  * @param   f file handle\r
@@ -286,7 +289,7 @@ int ext4_fclose(ext4_file *f);
  * @param   size bytes to read\r
  * @param   rcnt bytes read (may be NULL)\r
  * @return  standard error code*/\r
-int ext4_fread (ext4_file *f, void *buf, uint32_t size, uint32_t *rcnt);\r
+int ext4_fread(ext4_file *f, void *buf, uint32_t size, uint32_t *rcnt);\r
 \r
 /**@brief   Write data to file.\r
  * @param   f file handle\r
@@ -304,17 +307,17 @@ int ext4_fwrite(ext4_file *f, const void *buf, uint32_t size, uint32_t *wcnt);
  *              @ref SEEK_CUR\r
  *              @ref SEEK_END\r
  * @return  standard error code*/\r
-int ext4_fseek (ext4_file *f, uint64_t offset, uint32_t origin);\r
+int ext4_fseek(ext4_file *f, uint64_t offset, uint32_t origin);\r
 \r
 /**@brief   Get file position.\r
  * @param   f file handle\r
  * @return  actual file position */\r
-uint64_t ext4_ftell (ext4_file *f);\r
+uint64_t ext4_ftell(ext4_file *f);\r
 \r
 /**@brief   Get file size.\r
  * @param   f file handle\r
  * @return  file size */\r
-uint64_t ext4_fsize (ext4_file *f);\r
+uint64_t ext4_fsize(ext4_file *f);\r
 \r
 /*********************************DIRECTORY OPERATION***********************/\r
 \r
@@ -332,7 +335,7 @@ int ext4_dir_mk(const char *path);
  * @param   d directory handle\r
  * @param   path directory path\r
  * @return  standard error code*/\r
-int ext4_dir_open (ext4_dir *d, const char *path);\r
+int ext4_dir_open(ext4_dir *d, const char *path);\r
 \r
 /**@brief   Directory close.\r
  * @param   d directory handle\r
@@ -343,7 +346,7 @@ int ext4_dir_close(ext4_dir *d);
  * @param   d directory handle\r
  * @param   id entry id\r
  * @return  directory entry id (NULL if no entry)*/\r
-ext4_direntry* ext4_dir_entry_next(ext4_dir *d);\r
+ext4_direntry *ext4_dir_entry_next(ext4_dir *d);\r
 \r
 #endif /* EXT4_H_ */\r
 \r