Changeset 94e46c9 in mainline for uspace/lib/ext4/libext4_directory.c

Timestamp:

2015-05-23T04:09:11Z (9 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

b5143bd

Parents:

a25d893 (diff), 0683992 (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:

Mainline changes

File:

• uspace/lib/ext4/libext4_directory.c (modified) (1 diff)

uspace/lib/ext4/libext4_directory.c

@@ -390 +390 @@
             (ext4_inode_has_flag(parent->inode, EXT4_INODE_FLAG_INDEX))) {
                 int rc = ext4_directory_dx_add_entry(parent, child, name);
-                
+
                 /* Check if index is not corrupted */
-                if (rc != EXT4_ERR_BAD_DX_DIR) {
-                        if (rc != EOK)
-                                return rc;
-                        
-                        return EOK;
-                }
-                
+                if (rc != EXT4_ERR_BAD_DX_DIR)
+                        return rc;
+
                 /* Needed to clear dir index flag if corrupted */
                 ext4_inode_clear_flag(parent->inode, EXT4_INODE_FLAG_INDEX);