Changeset f066a87 in mainline

Timestamp:

2017-05-09T18:55:11Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

3345b86

Parents:

d2c8533

Message:

Ext4 should check for sanity before modifying the superblock.

Location:

uspace

Files:

• lib/ext4/libext4_filesystem.c (modified) (2 diffs)
• lib/ext4/libext4_filesystem.h (modified) (1 diff)
• srv/fs/ext4fs/ext4fs_ops.c (modified) (1 diff)

uspace/lib/ext4/libext4_filesystem.c

@@ -105 +105 @@
                 goto err_2;
         }
+        
+        rc = ext4_superblock_check_sanity(fs->superblock);
+        if (rc != EOK)
+                goto err_2;
 
         /* Mark system as mounted */
@@ -148 +152 @@
         
         return rc;
-}
-
-/** Check sanity of the filesystem.
- *
- * Main is the check of the superblock structure.
- *
- * @param fs Filesystem to be checked
- *
- * @return Error code
- *
- */
-int ext4_filesystem_check_sanity(ext4_filesystem_t *fs)
-{
-        /* Check superblock */
-        return ext4_superblock_check_sanity(fs->superblock);
 }
 

uspace/lib/ext4/libext4_filesystem.h

@@ -41 +41 @@
     enum cache_mode);
 extern int ext4_filesystem_fini(ext4_filesystem_t *);
-extern int ext4_filesystem_check_sanity(ext4_filesystem_t *);
 extern int ext4_filesystem_check_features(ext4_filesystem_t *, bool *);
 extern uint32_t ext4_filesystem_blockaddr2_index_in_group(ext4_superblock_t *,

uspace/srv/fs/ext4fs/ext4fs_ops.c

@@ -969 +969 @@
         int rc = ext4_filesystem_init(fs, service_id, cmode);
         if (rc != EOK) {
-                free(fs);
-                free(inst);
-                return rc;
-        }
-        
-        /* Do some sanity checking */
-        rc = ext4_filesystem_check_sanity(fs);
-        if (rc != EOK) {
-                ext4_filesystem_fini(fs);
                 free(fs);
                 free(inst);