Changeset ab936440 in mainline for uspace/lib/ext4/src/filesystem.c

Timestamp:

2019-02-12T20:42:42Z (7 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Branches:

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

Children:

f31ca47

Parents:

7f7817a9 (diff), 4805495 (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.

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:26:18)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:42:42)

Message:

Merge branch 'master' into bdsh_alias

Conflicts:

uspace/app/bdsh/Makefile
uspace/app/bdsh/cmds/modules/modules.h

Ccheck correction and removing header which includes itself

File:

• uspace/lib/ext4/src/filesystem.c (modified) (4 diffs)

uspace/lib/ext4/src/filesystem.c

@@ -421 +421 @@
     enum cache_mode cmode, aoff64_t *size, ext4_filesystem_t **rfs)
 {
+        int fs_inited = 0;
         ext4_filesystem_t *fs = NULL;
         fs_node_t *root_node = NULL;
@@ -437 +438 @@
         if (rc != EOK)
                 goto error;
+
+        fs_inited = 1;
 
         /* Read root node */
@@ -463 +466 @@
                 ext4_node_put(root_node);
 
-        if (fs != NULL) {
+        if (fs_inited)
                 ext4_filesystem_fini(fs);
-                free(fs);
-        }
-
+        free(fs);
         return rc;
 }
@@ -714 +715 @@
                 /* One for block bitmap one for inode bitmap */
                 free_blocks = free_blocks - reserved - 2 - inode_table_blocks;
-                if (bg_index == 0)
-                        ++free_blocks; /* XXX Why? */
 
                 ext4_block_group_set_free_blocks_count(bg_ref->block_group,