Changes in uspace/lib/ext4/src/filesystem.c [395df52:fcb0d76] in mainline

File:

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

uspace/lib/ext4/src/filesystem.c

@@ -32 +32 @@
  */
 /**
- * @file  filesystem.c
+ * @file  libext4_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"
@@ -51 +50 @@
 #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 for opening.
- *
- * But do not mark mounted just yet.
+/** Initialize filesystem and read all needed data.
  *
  * @param fs         Filesystem instance to be initialized
- * @param service_id Block device to open
- * @param cmode      Cache mode
- *
- * @return Error code
- *
- */
-static int ext4_filesystem_init(ext4_filesystem_t *fs, service_id_t service_id,
+ * @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)
 {
@@ -120 +113 @@
                 goto err_2;
         }
-
+        
         rc = ext4_superblock_check_sanity(fs->superblock);
         if (rc != EOK)
                 goto err_2;
 
-        /* Check flags */
-        bool read_only;
-        rc = ext4_filesystem_check_features(fs, &read_only);
+        /* 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;
 
+        uint16_t mnt_count = ext4_superblock_get_mount_count(fs->superblock);
+        ext4_superblock_set_mount_count(fs->superblock, mnt_count + 1);
+
         return EOK;
+
 err_2:
         block_cache_fini(fs->device);
@@ -142 +139 @@
 }
 
-/** Finalize filesystem.
- *
- * @param fs Filesystem to be finalized
- *
- */
-static void ext4_filesystem_fini(ext4_filesystem_t *fs)
-{
+/** Destroy filesystem instance (used by unmount operation).
+ *
+ * @param fs Filesystem to be destroyed
+ *
+ * @return Error code
+ *
+ */
+int ext4_filesystem_fini(ext4_filesystem_t *fs)
+{
+        /* Write the superblock to the device */
+        ext4_superblock_set_state(fs->superblock, EXT4_SUPERBLOCK_STATE_VALID_FS);
+        int rc = ext4_superblock_write_direct(fs->device, fs->superblock);
+        
         /* Release memory space for superblock */
         free(fs->superblock);
@@ -155 +158 @@
         block_cache_fini(fs->device);
         block_fini(fs->device);
-}
-
-/** Probe filesystem.
- *
- * @param service_id Block device to probe
- *
- * @return EOK or negative error code.
- *
- */
-int ext4_filesystem_probe(service_id_t service_id)
-{
-        ext4_filesystem_t *fs = NULL;
-        int rc;
-
-        fs = calloc(1, sizeof(ext4_filesystem_t));
-        if (fs == NULL)
-                return ENOMEM;
-
-        /* Initialize the file system for opening */
-        rc = ext4_filesystem_init(fs, service_id, CACHE_MODE_WT);
-        if (rc != EOK) {
-                free(fs);
-                return rc;
-        }
-
-        ext4_filesystem_fini(fs);
-        return EOK;
-}
-
-/** Open filesystem and read all needed data.
- *
- * @param fs         Filesystem to be initialized
- * @param inst       Instance
- * @param service_id Identifier if device with the filesystem
- * @param cmode      Cache mode
- * @param size       Output value - size of root node
- *
- * @return Error code
- *
- */
-int ext4_filesystem_open(ext4_instance_t *inst, service_id_t service_id,
-    enum cache_mode cmode, aoff64_t *size, ext4_filesystem_t **rfs)
-{
-        ext4_filesystem_t *fs = NULL;
-        fs_node_t *root_node = NULL;
-        int rc;
-
-        fs = calloc(1, sizeof(ext4_filesystem_t));
-        if (fs == NULL) {
-                rc = ENOMEM;
-                goto error;
-        }
-
-        inst->filesystem = fs;
-
-        /* Initialize the file system for opening */
-        rc = ext4_filesystem_init(fs, service_id, cmode);
-        if (rc != EOK)
-                goto error;
-
-        /* Read root node */
-        rc = ext4_node_get_core(&root_node, inst, EXT4_INODE_ROOT_INDEX);
-        if (rc != EOK)
-                goto error;
-
-        /* 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 error;
-
-        uint16_t mnt_count = ext4_superblock_get_mount_count(fs->superblock);
-        ext4_superblock_set_mount_count(fs->superblock, mnt_count + 1);
-
-        ext4_node_t *enode = EXT4_NODE(root_node);
-
-        *size = ext4_inode_get_size(fs->superblock, enode->inode_ref->inode);
-
-        ext4_node_put(root_node);
-        *rfs = fs;
-        return EOK;
-error:
-        if (root_node != NULL)
-                ext4_node_put(root_node);
-
-        if (fs != NULL) {
-                ext4_filesystem_fini(fs);
-                free(fs);
-        }
-
+        
         return rc;
-}
-
-/** Close filesystem.
- *
- * @param fs Filesystem to be destroyed
- *
- * @return EOK or negative error code. On error the state of the file
- *         system is unchanged.
- *
- */
-int ext4_filesystem_close(ext4_filesystem_t *fs)
-{
-        /* Write the superblock to the device */
-        ext4_superblock_set_state(fs->superblock, EXT4_SUPERBLOCK_STATE_VALID_FS);
-        int rc = ext4_superblock_write_direct(fs->device, fs->superblock);
-        if (rc != EOK)
-                return rc;
-
-        ext4_filesystem_fini(fs);
-        return EOK;
 }
 
@@ -275 +169 @@
  *
  * @param fs        Filesystem to be checked
- * @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)
+ * @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)
 {
         /* Feature flags are present only in higher revisions */