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

Timestamp:

2017-05-11T22:07:09Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

be39fc6

Parents:

71fe4723

Message:

Move parts of ext4 filesystem initialization.

File:

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

uspace/lib/ext4/src/filesystem.c

@@ -32 +32 @@
  */
 /**
- * @file  libext4_filesystem.c
+ * @file  filesystem.c
  * @brief More complex filesystem operations.
  */
@@ -42 +42 @@
 #include <crypto.h>
 #include <ipc/vfs.h>
+#include <libfs.h>
 #include <stdlib.h>
 #include "ext4/balloc.h"
@@ -50 +51 @@
 #include "ext4/ialloc.h"
 #include "ext4/inode.h"
+#include "ext4/ops.h"
 #include "ext4/superblock.h"
+
+static int ext4_filesystem_check_features(ext4_filesystem_t *, bool *);
 
 /** Initialize filesystem and read all needed data.
@@ -56 +60 @@
  * @param fs         Filesystem instance to be initialized
  * @param service_id Identifier if device with the filesystem
- *
- * @return Error code
- *
- */
-int ext4_filesystem_init(ext4_filesystem_t *fs, service_id_t service_id,
-    enum cache_mode cmode)
+ * @param cmode      Cache mode
+ * @param read_only  Place to store read only flag
+ * @param index      Output value - index of root node
+ * @param size       Output value - size of root node
+ * @param lnkcnt     Output value - link count of root node
+ *
+ * @return Error code
+ *
+ */
+int ext4_filesystem_init(ext4_filesystem_t *fs, ext4fs_instance_t *inst,
+    service_id_t service_id, enum cache_mode cmode, aoff64_t *size)
 {
         int rc;
@@ -118 +127 @@
                 goto err_2;
 
+        /* Check flags */
+        bool read_only;
+        rc = ext4_filesystem_check_features(fs, &read_only);
+        if (rc != EOK)
+                goto err_2;
+
+        /* Read root node */
+        fs_node_t *root_node;
+        rc = ext4fs_node_get_core(&root_node, inst, EXT4_INODE_ROOT_INDEX);
+        if (rc != EOK)
+                goto err_2;
+
         /* Mark system as mounted */
         ext4_superblock_set_state(fs->superblock, EXT4_SUPERBLOCK_STATE_ERROR_FS);
         rc = ext4_superblock_write_direct(fs->device, fs->superblock);
         if (rc != EOK)
-                goto err_2;
+                goto err_3;
 
         uint16_t mnt_count = ext4_superblock_get_mount_count(fs->superblock);
         ext4_superblock_set_mount_count(fs->superblock, mnt_count + 1);
 
+        ext4fs_node_t *enode = EXT4FS_NODE(root_node);
+        
+        *size = ext4_inode_get_size(fs->superblock, enode->inode_ref->inode);
+
+        ext4fs_node_put(root_node);
         return EOK;
-
+err_3:
+        ext4fs_node_put(root_node);
 err_2:
         block_cache_fini(fs->device);
@@ -169 +196 @@
  *
  * @param fs        Filesystem to be checked
- * @param read_only Flag if filesystem should be mounted only for reading
- *
- * @return Error code
- *
- */
-int ext4_filesystem_check_features(ext4_filesystem_t *fs, bool *read_only)
+ * @param read_only Place to write flag saying whether filesystem
+ *                  should be mounted only for reading
+ *
+ * @return Error code
+ *
+ */
+static int ext4_filesystem_check_features(ext4_filesystem_t *fs,
+    bool *read_only)
 {
         /* Feature flags are present only in higher revisions */