Index: uspace/lib/ext4/libext4_filesystem.c
===================================================================
--- uspace/lib/ext4/libext4_filesystem.c	(revision d2c8533502ff5b2f8ab86192d66ca356e4b9a813)
+++ uspace/lib/ext4/libext4_filesystem.c	(revision f066a87844b5b81c924cd3bda3e9afda66937cdf)
@@ -105,4 +105,8 @@
 		goto err_2;
 	}
+	
+	rc = ext4_superblock_check_sanity(fs->superblock);
+	if (rc != EOK)
+		goto err_2;
 
 	/* Mark system as mounted */
@@ -148,19 +152,4 @@
 	
 	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);
 }
 
Index: uspace/lib/ext4/libext4_filesystem.h
===================================================================
--- uspace/lib/ext4/libext4_filesystem.h	(revision d2c8533502ff5b2f8ab86192d66ca356e4b9a813)
+++ uspace/lib/ext4/libext4_filesystem.h	(revision f066a87844b5b81c924cd3bda3e9afda66937cdf)
@@ -41,5 +41,4 @@
     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 *,
Index: uspace/srv/fs/ext4fs/ext4fs_ops.c
===================================================================
--- uspace/srv/fs/ext4fs/ext4fs_ops.c	(revision d2c8533502ff5b2f8ab86192d66ca356e4b9a813)
+++ uspace/srv/fs/ext4fs/ext4fs_ops.c	(revision f066a87844b5b81c924cd3bda3e9afda66937cdf)
@@ -969,13 +969,4 @@
 	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);